Skip to content

L
linux
Commit e80cbdd3 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Jens Axboe
Browse files
Options

[PATCH] Mac/m68k ADB HID 

ADB HID: Exclude PowerMac-specific things on classic Macs
parent e9a5b39d
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
drivers/macintosh/adbhid.c
View file @ e80cbdd3
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
#include <linux/pmu.h> #include <linux/pmu.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#ifdef CONFIG_PPC_PMAC
#include <asm/pmac_feature.h> #include <asm/pmac_feature.h>
#endif
#ifdef CONFIG_PMAC_BACKLIGHT #ifdef CONFIG_PMAC_BACKLIGHT
#include <asm/backlight.h> #include <asm/backlight.h>
...@@ -160,6 +162,7 @@ adbhid_input_keycode(int id, int keycode, int repeat, struct pt_regs *regs) ...@@ -160,6 +162,7 @@ adbhid_input_keycode(int id, int keycode, int repeat, struct pt_regs *regs)
return; return;
case 0x3f: /* ignore Powerbook Fn key */ case 0x3f: /* ignore Powerbook Fn key */
return; return;
#ifdef CONFIG_PPC_PMAC
case 0x7e: /* Power key on PBook 3400 needs remapping */ case 0x7e: /* Power key on PBook 3400 needs remapping */
switch(pmac_call_feature(PMAC_FTR_GET_MB_INFO, switch(pmac_call_feature(PMAC_FTR_GET_MB_INFO,
NULL, PMAC_MB_INFO_MODEL, 0)) { NULL, PMAC_MB_INFO_MODEL, 0)) {
...@@ -169,6 +172,7 @@ adbhid_input_keycode(int id, int keycode, int repeat, struct pt_regs *regs) ...@@ -169,6 +172,7 @@ adbhid_input_keycode(int id, int keycode, int repeat, struct pt_regs *regs)
keycode = 0x7f; keycode = 0x7f;
} }
break; break;
#endif /* CONFIG_PPC_PMAC */
} }
if (adbhid[id]->keycode[keycode]) { if (adbhid[id]->keycode[keycode]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7