Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[mv-sheeva.git] / drivers / hid / hid-apple.c

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index acbce5745b0c8b41e2644ac05a3293d05c931165..303ccce05bb3b4c44cacb0d349ac1ccbfb3812b9 100644 (file)
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -436,10 +436,6 @@ static const struct hid_device_id apple_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
 
-       /* Apple wireless Mighty Mouse */
-       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c),
-               .driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },
-
        { }
 };
 MODULE_DEVICE_TABLE(hid, apple_devices);