2 files changed, 6 insertions, 1 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 98ddafa30535..88e29074ac90 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -84,6 +84,7 @@ config INPUT_ATLAS_BTNS
 
 config INPUT_ATI_REMOTE
         tristate "ATI / X10 USB RF remote control"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use an ATI or X10 "Lola" USB remote control.
@@ -99,6 +100,7 @@ config INPUT_ATI_REMOTE
 
 config INPUT_ATI_REMOTE2
         tristate "ATI / Philips USB RF remote control"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use an ATI or Philips USB RF remote control.
@@ -114,6 +116,7 @@ config INPUT_ATI_REMOTE2
 config INPUT_KEYSPAN_REMOTE
         tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
         depends on EXPERIMENTAL
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use a Keyspan DMR USB remote control.
@@ -128,6 +131,7 @@ config INPUT_KEYSPAN_REMOTE
 
 config INPUT_POWERMATE
         tristate "Griffin PowerMate and Contour Jog support"
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to use Griffin PowerMate or Contour Jog devices.
@@ -144,6 +148,7 @@ config INPUT_POWERMATE
 config INPUT_YEALINK
         tristate "Yealink usb-p1k voip phone"
         depends EXPERIMENTAL
+        depends on USB_ARCH_HAS_HCD
         select USB
         help
           Say Y here if you want to enable keyboard and LCD functions of the
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 3d4b619dadab..e759944041ab 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -51,7 +51,7 @@ static void ixp4xx_spkr_control(unsigned int pin, unsigned int count)
 
 static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-        unsigned int pin = (unsigned int) input_get_drvdata(input_dev);
+        unsigned int pin = (unsigned int) input_get_drvdata(dev);
         unsigned int count = 0;
 
         if (type != EV_SND)