Merge branch 'linus' into x86/pebs

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index c3eb3f13e2ca..5c52a20ad344 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1,6 +1,4 @@
 /*
- * $Id: hid-input.c,v 1.2 2002/04/23 00:59:25 rdamazio Exp $
- *
  *  Copyright (c) 2000-2001 Vojtech Pavlik
  *  Copyright (c) 2006-2007 Jiri Kosina
  *
@@ -218,8 +216,9 @@ int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
                         }
                 }
 
-                if (test_bit(usage->code, hid->pb_pressed_numlock) ||
-                                test_bit(LED_NUML, input->led)) {
+                if (hid->quirks & HID_QUIRK_APPLE_NUMLOCK_EMULATION && (
+                                test_bit(usage->code, hid->pb_pressed_numlock) ||
+                                test_bit(LED_NUML, input->led))) {
                         trans = find_translation(powerbook_numlock_keys, usage->code);
 
                         if (trans) {