[IPV6]: Convert cork.hop_limit and cork.tclass into u8 instead of int.

[mv-sheeva.git] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index 9a963fe97300b9afd557aad9d441b5ed4b8a9a3b..1bdc39a8c76c6a0916af7b6698fdcd219a26c1fb 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -371,6 +371,8 @@ struct input_absinfo {
 #define KEY_BRIGHTNESS_ZERO    244     /* brightness off, use ambient */
 #define KEY_DISPLAY_OFF                245     /* display device to off state */
 
+#define KEY_WIMAX              246
+
 #define BTN_MISC               0x100
 #define BTN_0                  0x100
 #define BTN_1                  0x101
@@ -1018,7 +1020,6 @@ struct ff_effect {
  * @going_away: marks devices that are in a middle of unregistering and
  *     causes input_open_device*() fail with -ENODEV.
  * @dev: driver model's view of this device
- * @cdev: union for struct device pointer
  * @h_list: list of input handles associated with the device. When
  *     accessing the list dev->mutex must be held
  * @node: used to place the device onto input_dev_list
@@ -1083,9 +1084,6 @@ struct input_dev {
        int going_away;
 
        struct device dev;
-       union {                 /* temporarily so while we switching to struct device */
-               struct device *dev;
-       } cdev;
 
        struct list_head        h_list;
        struct list_head        node;