Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

diff --combined include/linux/input.h
index d783631,e3d9c08..f623c74
--- 1/include/linux/input.h
--- 2/include/linux/input.h
+++ b/include/linux/input.h
@@@ -12,6 -12,7 +12,7 @@@
  #ifdef __KERNEL__
  #include <linux/time.h>
  #include <linux/list.h>
+ #include <linux/device.h>
  #else
  #include <sys/time.h>
  #include <sys/ioctl.h>
@@@ -644,7 -645,6 +645,7 @@@ struct input_absinfo 
  #define BUS_ADB                       0x17
  #define BUS_I2C                       0x18
  #define BUS_HOST              0x19
 +#define BUS_GSC                       0x1A
  
  /*
   * Values describing the status of an effect
@@@ -890,11 -890,15 +891,15 @@@ struct input_dev 
        struct semaphore sem;   /* serializes open and close operations */
        unsigned int users;
  
-       struct device *dev;
+       struct class_device cdev;
+       struct device *dev;     /* will be removed soon */
+ 
+       int dynalloc;   /* temporarily */
  
        struct list_head        h_list;
        struct list_head        node;
  };
+ #define to_input_dev(d) container_of(d, struct input_dev, cdev)
  
  /*
   * Structure for hotplug & device<->driver matching.
@@@ -985,6 -989,23 +990,23 @@@ static inline void init_input_dev(struc
        INIT_LIST_HEAD(&dev->node);
  }
  
+ struct input_dev *input_allocate_device(void);
+ 
+ static inline void input_free_device(struct input_dev *dev)
+ {
+       kfree(dev);
+ }
+ 
+ static inline struct input_dev *input_get_device(struct input_dev *dev)
+ {
+       return to_input_dev(class_device_get(&dev->cdev));
+ }
+ 
+ static inline void input_put_device(struct input_dev *dev)
+ {
+       class_device_put(&dev->cdev);
+ }
+ 
  void input_register_device(struct input_dev *);
  void input_unregister_device(struct input_dev *);
  
@@@ -1053,7 -1074,7 +1075,7 @@@ static inline void input_set_abs_params
        dev->absbit[LONG(axis)] |= BIT(axis);
  }
  
- extern struct class *input_class;
+ extern struct class input_class;
  
  #endif
  #endif