]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Olaf Hering <olh@suse.de> |
2 | Subject: enable mouse button emulation also for G5 | |
3 | Patch-mainline: never | |
4 | ||
5 | fix compile errors | |
6 | ||
7 | drivers/macintosh/Kconfig | 2 +- | |
8 | drivers/macintosh/adb.c | 4 ++++ | |
9 | drivers/macintosh/adbhid.c | 6 +++++- | |
10 | 3 files changed, 10 insertions(+), 2 deletions(-) | |
11 | ||
12 | --- a/drivers/macintosh/Kconfig | |
13 | +++ b/drivers/macintosh/Kconfig | |
14 | @@ -13,7 +13,7 @@ if MACINTOSH_DRIVERS | |
15 | ||
16 | config ADB | |
17 | bool "Apple Desktop Bus (ADB) support" | |
18 | - depends on MAC || (PPC_PMAC && PPC32) | |
19 | + depends on MAC || PPC_PMAC | |
20 | help | |
21 | Apple Desktop Bus (ADB) support is for support of devices which | |
22 | are connected to an ADB port. ADB devices tend to have 4 pins. | |
23 | --- a/drivers/macintosh/adb.c | |
24 | +++ b/drivers/macintosh/adb.c | |
25 | @@ -298,6 +298,10 @@ static int __init adb_init(void) | |
26 | if (!machine_is(chrp) && !machine_is(powermac)) | |
27 | return 0; | |
28 | #endif | |
29 | +#ifdef CONFIG_PPC64 | |
30 | + if (!machine_is(powermac)) | |
31 | + return 0; | |
32 | +#endif | |
33 | #ifdef CONFIG_MAC | |
34 | if (!MACH_IS_MAC) | |
35 | return 0; | |
36 | --- a/drivers/macintosh/adbhid.c | |
37 | +++ b/drivers/macintosh/adbhid.c | |
38 | @@ -1264,10 +1264,14 @@ init_ms_a3(int id) | |
39 | ||
40 | static int __init adbhid_init(void) | |
41 | { | |
42 | -#ifndef CONFIG_MAC | |
43 | +#ifdef CONFIG_PPC32 | |
44 | if (!machine_is(chrp) && !machine_is(powermac)) | |
45 | return 0; | |
46 | #endif | |
47 | +#ifdef CONFIG_PPC64 | |
48 | + if (!machine_is(powermac)) | |
49 | + return 0; | |
50 | +#endif | |
51 | ||
52 | led_request.complete = 1; | |
53 |