Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / drivers / hid / hid-dummy.c

diff --git a/drivers/hid/hid-dummy.c b/drivers/hid/hid-dummy.c
index 1c9e7c2814a5a6cb94430b8e097abbe83d2f0631..e148f86fb58e188e6e622e8a4e01daec0ecc4129 100644 (file)
--- a/drivers/hid/hid-dummy.c
+++ b/drivers/hid/hid-dummy.c
@@ -13,6 +13,9 @@ static int __init hid_dummy_init(void)
 #ifdef CONFIG_HID_BELKIN_MODULE
        HID_COMPAT_CALL_DRIVER(belkin);
 #endif
+#ifdef CONFIG_HID_BRIGHT_MODULE
+       HID_COMPAT_CALL_DRIVER(bright);
+#endif
 #ifdef CONFIG_HID_CHERRY_MODULE
        HID_COMPAT_CALL_DRIVER(cherry);
 #endif
@@ -22,10 +25,13 @@ static int __init hid_dummy_init(void)
 #ifdef CONFIG_HID_CYPRESS_MODULE
        HID_COMPAT_CALL_DRIVER(cypress);
 #endif
+#ifdef CONFIG_HID_DELL_MODULE
+       HID_COMPAT_CALL_DRIVER(dell);
+#endif
 #ifdef CONFIG_HID_EZKEY_MODULE
        HID_COMPAT_CALL_DRIVER(ezkey);
 #endif
-#ifdef CONFIG_HID_EZKEY_MODULE
+#ifdef CONFIG_HID_GYRATION_MODULE
        HID_COMPAT_CALL_DRIVER(gyration);
 #endif
 #ifdef CONFIG_HID_LOGITECH_MODULE
@@ -37,12 +43,27 @@ static int __init hid_dummy_init(void)
 #ifdef CONFIG_HID_MONTEREY_MODULE
        HID_COMPAT_CALL_DRIVER(monterey);
 #endif
+#ifdef CONFIG_HID_PANTHERLORD_MODULE
+       HID_COMPAT_CALL_DRIVER(pantherlord);
+#endif
 #ifdef CONFIG_HID_PETALYNX_MODULE
        HID_COMPAT_CALL_DRIVER(petalynx);
 #endif
+#ifdef CONFIG_HID_SAMSUNG_MODULE
+       HID_COMPAT_CALL_DRIVER(samsung);
+#endif
+#ifdef CONFIG_HID_SONY_MODULE
+       HID_COMPAT_CALL_DRIVER(sony);
+#endif
 #ifdef CONFIG_HID_SUNPLUS_MODULE
        HID_COMPAT_CALL_DRIVER(sunplus);
 #endif
+#ifdef CONFIG_THRUSTMASTER_FF_MODULE
+       HID_COMPAT_CALL_DRIVER(thrustmaster);
+#endif
+#ifdef CONFIG_ZEROPLUS_FF_MODULE
+       HID_COMPAT_CALL_DRIVER(zeroplus);
+#endif
 
        return -EIO;
 }