10 files changed, 24 insertions, 23 deletions

diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index 4941a9e61e90..43aaa5cebd12 100644
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -24,7 +24,7 @@ MODULE_DESCRIPTION("PC Speaker beeper driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:pcspkr");
 
-#ifdef CONFIG_X86
+#if defined(CONFIG_MIPS) || defined(CONFIG_X86)
 /* Use the global PIT lock ! */
 #include <asm/i8253.h>
 #else
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index a3637d870880..fed3c375ccf3 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -195,7 +195,7 @@ static struct of_platform_driver ebus_beep_driver = {
         .name           = "beep",
         .match_table    = ebus_beep_match,
         .probe          = ebus_beep_probe,
-        .remove         = sparcspkr_remove,
+        .remove         = __devexit_p(sparcspkr_remove),
         .shutdown       = sparcspkr_shutdown,
 };
 
@@ -236,7 +236,7 @@ static struct of_platform_driver isa_beep_driver = {
         .name           = "beep",
         .match_table    = isa_beep_match,
         .probe          = isa_beep_probe,
-        .remove         = sparcspkr_remove,
+        .remove         = __devexit_p(sparcspkr_remove),
         .shutdown       = sparcspkr_shutdown,
 };
 
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index b438d998625c..72176f3d49cb 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -998,12 +998,12 @@ static void wistron_wifi_led_set(struct led_classdev *led_cdev,
 }
 
 static struct led_classdev wistron_mail_led = {
-        .name                   = "mail:green",
+        .name                   = "wistron:green:mail",
         .brightness_set         = wistron_mail_led_set,
 };
 
 static struct led_classdev wistron_wifi_led = {
-        .name                   = "wifi:red",
+        .name                   = "wistron:red:wifi",
         .brightness_set         = wistron_wifi_led_set,
 };
 
diff --git a/drivers/input/mouse/pc110pad.c b/drivers/input/mouse/pc110pad.c
index 8991ab0b4fe3..61cff8374e6c 100644
--- a/drivers/input/mouse/pc110pad.c
+++ b/drivers/input/mouse/pc110pad.c
@@ -39,6 +39,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -62,8 +63,10 @@ static irqreturn_t pc110pad_interrupt(int irq, void *ptr)
         int value     = inb_p(pc110pad_io);
         int handshake = inb_p(pc110pad_io + 2);
 
-        outb_p(handshake |  1, pc110pad_io + 2);
-        outb_p(handshake & ~1, pc110pad_io + 2);
+        outb(handshake |  1, pc110pad_io + 2);
+        udelay(2);
+        outb(handshake & ~1, pc110pad_io + 2);
+        udelay(2);
         inb_p(0x64);
 
         pc110pad_data[pc110pad_count++] = value;
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 5ce632ca6815..b88569e21d60 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -21,7 +21,7 @@ if SERIO
 config SERIO_I8042
         tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
         default y
-        depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BFIN
+        depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN
         ---help---
           i8042 is the chip over which the standard AT keyboard and PS/2
           mouse are connected to the computer. If you use these devices,
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 3e99df6be084..adc3bd6e7f7b 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -141,7 +141,7 @@ static void gscps2_flush(struct gscps2port *ps2port)
 /*
  * gscps2_writeb_output() - write a byte to the port
  *
- * returns 1 on sucess, 0 on error
+ * returns 1 on success, 0 on error
  */
 
 static inline int gscps2_writeb_output(struct gscps2port *ps2port, u8 data)
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 1c08ecc54770..58934a40f5ce 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -268,13 +268,12 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
         ts->irq_disabled = 0;
         enable_irq(spi->irq);
 
-        if (req->msg.status)
-                status = req->msg.status;
-
-        /* on-wire is a must-ignore bit, a BE12 value, then padding */
-        sample = be16_to_cpu(req->sample);
-        sample = sample >> 3;
-        sample &= 0x0fff;
+        if (status == 0) {
+                /* on-wire is a must-ignore bit, a BE12 value, then padding */
+                sample = be16_to_cpu(req->sample);
+                sample = sample >> 3;
+                sample &= 0x0fff;
+        }
 
         kfree(req);
         return status ? status : sample;
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index b1b2e07bf080..99d92f5c93d6 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -74,10 +74,10 @@ extern unsigned int get_clk_frequency_khz(int info);
 
 static unsigned long calc_waittime(struct corgi_ts *corgi_ts)
 {
-        unsigned long hsync_len = corgi_ts->machinfo->get_hsync_len();
+        unsigned long hsync_invperiod = corgi_ts->machinfo->get_hsync_invperiod();
 
-        if (hsync_len)
-                return get_clk_frequency_khz(0)*1000/hsync_len;
+        if (hsync_invperiod)
+                return get_clk_frequency_khz(0)*1000/hsync_invperiod;
         else
                 return 0;
 }
@@ -114,7 +114,7 @@ static int sync_receive_data_send_cmd(struct corgi_ts *corgi_ts, int doRecive, i
                         if (timer2-timer1 > wait_time) {
                                 /* too slow - timeout, try again */
                                 corgi_ts->machinfo->wait_hsync();
-                                /* get OSCR */
+                                /* get CCNT */
                                 CCNT(timer1);
                                 /* Wait after HSync */
                                 CCNT(timer2);
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
index 2ae6c6016a86..28ae15ed12c5 100644
--- a/drivers/input/touchscreen/h3600_ts_input.c
+++ b/drivers/input/touchscreen/h3600_ts_input.c
@@ -109,7 +109,7 @@ struct h3600_dev {
 static irqreturn_t action_button_handler(int irq, void *dev_id)
 {
         int down = (GPLR & GPIO_BITSY_ACTION_BUTTON) ? 0 : 1;
-        struct input_dev *dev = (struct input_dev *) dev_id;
+        struct input_dev *dev = dev_id;
 
         input_report_key(dev, KEY_ENTER, down);
         input_sync(dev);
@@ -120,7 +120,7 @@ static irqreturn_t action_button_handler(int irq, void *dev_id)
 static irqreturn_t npower_button_handler(int irq, void *dev_id)
 {
         int down = (GPLR & GPIO_BITSY_NPOWER_BUTTON) ? 0 : 1;
-        struct input_dev *dev = (struct input_dev *) dev_id;
+        struct input_dev *dev = dev_id;
 
         /*
          * This interrupt is only called when we release the key. So we have
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 35faf469eff2..607f9933aa1f 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -26,7 +26,6 @@
 #include <linux/kthread.h>
 #include <linux/freezer.h>
 
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/ac97_codec.h>