Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[linux-2.6-omap-h63xx.git] / drivers / macintosh / adbhid.c

diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index b7f41d3823a6935ad26f7da6f6c2bb19ff7e3170..5396c67ba0a45c9b7cc1196590d1cffe18b49f60 100644 (file)
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -75,7 +75,7 @@ static struct notifier_block adbhid_adb_notifier = {
 #define ADB_KEY_POWER_OLD      0x7e
 #define ADB_KEY_POWER          0x7f
 
-u16 adb_to_linux_keycodes[128] = {
+static const u16 adb_to_linux_keycodes[128] = {
        /* 0x00 */ KEY_A,               /*  30 */
        /* 0x01 */ KEY_S,               /*  31 */
        /* 0x02 */ KEY_D,               /*  32 */