diff options
| author | Len Brown <len.brown@intel.com> | 2007-12-13 22:12:38 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-12-13 22:12:38 -0500 |
| commit | 6790acb14d264d874ff8cbae1a72e72883ec3678 (patch) | |
| tree | 7c56658f9bc4ad76b32fabf7b4f85939c69f7f21 /drivers | |
| parent | ffada8913e39e6fd35e95d7040ccac57b45812c9 (diff) | |
| parent | 56a185b43be05e48da7428e6a1d3e2585b232b1d (diff) | |
| download | blackbird-op-linux-6790acb14d264d874ff8cbae1a72e72883ec3678.tar.gz blackbird-op-linux-6790acb14d264d874ff8cbae1a72e72883ec3678.zip | |
Pull thinkpad-2.6.24 into release branch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/thinkpad_acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index ab23a3221585..cf56647a6ca4 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c @@ -987,9 +987,9 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) KEY_UNKNOWN, /* 0x0C: FN+BACKSPACE */ KEY_UNKNOWN, /* 0x0D: FN+INSERT */ KEY_UNKNOWN, /* 0x0E: FN+DELETE */ - KEY_BRIGHTNESSUP, /* 0x0F: FN+HOME (brightness up) */ + KEY_RESERVED, /* 0x0F: FN+HOME (brightness up) */ /* Scan codes 0x10 to 0x1F: Extended ACPI HKEY hot keys */ - KEY_BRIGHTNESSDOWN, /* 0x10: FN+END (brightness down) */ + KEY_RESERVED, /* 0x10: FN+END (brightness down) */ KEY_RESERVED, /* 0x11: FN+PGUP (thinklight toggle) */ KEY_UNKNOWN, /* 0x12: FN+PGDOWN */ KEY_ZOOM, /* 0x13: FN+SPACE (zoom) */ |
