Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6-omap-h63xx.git] / include / linux / uwb.h

diff --git a/include/linux/uwb.h b/include/linux/uwb.h
index 0cd35937e1203c3f146dd3f86ce6f8c7628e5a27..f9ccbd9a2ced4fd832d6b7c12e7d687c7bcba545 100644 (file)
--- a/include/linux/uwb.h
+++ b/include/linux/uwb.h
@@ -361,6 +361,9 @@ struct uwb_rc {
 
 /**
  * struct uwb_pal - a UWB PAL
+ * @name:    descriptive name for this PAL (wushc, wlp, etc.).
+ * @device:  a device for the PAL.  Used to link the PAL and the radio
+ *           controller in sysfs.
  * @new_rsv: called when a peer requests a reservation (may be NULL if
  *           the PAL cannot accept reservation requests).
  *
@@ -379,7 +382,8 @@ struct uwb_rc {
  */
 struct uwb_pal {
        struct list_head node;
-
+       const char *name;
+       struct device *device;
        void (*new_rsv)(struct uwb_rsv *rsv);
 };