You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
1.3 KiB
54 lines
1.3 KiB
From: Olaf Hering <olh@suse.de>
|
|
Subject: enable mouse button emulation also for G5
|
|
Patch-mainline: never
|
|
|
|
fix compile errors
|
|
|
|
drivers/macintosh/Kconfig | 2 +-
|
|
drivers/macintosh/adb.c | 4 ++++
|
|
drivers/macintosh/adbhid.c | 6 +++++-
|
|
3 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/macintosh/Kconfig
|
|
+++ b/drivers/macintosh/Kconfig
|
|
@@ -13,7 +13,7 @@ if MACINTOSH_DRIVERS
|
|
|
|
config ADB
|
|
bool "Apple Desktop Bus (ADB) support"
|
|
- depends on MAC || (PPC_PMAC && PPC32)
|
|
+ depends on MAC || PPC_PMAC
|
|
help
|
|
Apple Desktop Bus (ADB) support is for support of devices which
|
|
are connected to an ADB port. ADB devices tend to have 4 pins.
|
|
--- a/drivers/macintosh/adb.c
|
|
+++ b/drivers/macintosh/adb.c
|
|
@@ -298,6 +298,10 @@ static int __init adb_init(void)
|
|
if (!machine_is(chrp) && !machine_is(powermac))
|
|
return 0;
|
|
#endif
|
|
+#ifdef CONFIG_PPC64
|
|
+ if (!machine_is(powermac))
|
|
+ return 0;
|
|
+#endif
|
|
#ifdef CONFIG_MAC
|
|
if (!MACH_IS_MAC)
|
|
return 0;
|
|
--- a/drivers/macintosh/adbhid.c
|
|
+++ b/drivers/macintosh/adbhid.c
|
|
@@ -1264,10 +1264,14 @@ init_ms_a3(int id)
|
|
|
|
static int __init adbhid_init(void)
|
|
{
|
|
-#ifndef CONFIG_MAC
|
|
+#ifdef CONFIG_PPC32
|
|
if (!machine_is(chrp) && !machine_is(powermac))
|
|
return 0;
|
|
#endif
|
|
+#ifdef CONFIG_PPC64
|
|
+ if (!machine_is(powermac))
|
|
+ return 0;
|
|
+#endif
|
|
|
|
led_request.complete = 1;
|
|
|