diff options
author | Soeren Sonnenburg <kernel@nn7.de> | 2007-02-08 17:20:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 12:25:47 -0500 |
commit | 45941d0481f538324fa21d6450116d13f6e51e91 (patch) | |
tree | 263504809371b31622fc181917037a128d361a5d | |
parent | 835d90c4218dffe6f9e7ac1ed79795197a4970c4 (diff) |
[PATCH] enable mouse button 2+3 emulation for x86 macs
As macbook/macbook pro's also have to live with a single mouse button the
following patch just enables the Macintosh device drivers menu in Kconfig +
adds the macintosh dir to the obj-* to make macbook* users happy (who use
exactly that since months....
Signed-off-by: Soeren Sonnenburg <kernel@nn7.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/Makefile | 2 | ||||
-rw-r--r-- | drivers/macintosh/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 0dd96d1afd39..f28dcb4ec8b3 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
@@ -30,7 +30,7 @@ obj-$(CONFIG_PARPORT) += parport/ | |||
30 | obj-y += base/ block/ misc/ mfd/ net/ media/ | 30 | obj-y += base/ block/ misc/ mfd/ net/ media/ |
31 | obj-$(CONFIG_NUBUS) += nubus/ | 31 | obj-$(CONFIG_NUBUS) += nubus/ |
32 | obj-$(CONFIG_ATM) += atm/ | 32 | obj-$(CONFIG_ATM) += atm/ |
33 | obj-$(CONFIG_PPC_PMAC) += macintosh/ | 33 | obj-y += macintosh/ |
34 | obj-$(CONFIG_IDE) += ide/ | 34 | obj-$(CONFIG_IDE) += ide/ |
35 | obj-$(CONFIG_FC4) += fc4/ | 35 | obj-$(CONFIG_FC4) += fc4/ |
36 | obj-$(CONFIG_SCSI) += scsi/ | 36 | obj-$(CONFIG_SCSI) += scsi/ |
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index a9e747c39791..1a86387e23be 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | menu "Macintosh device drivers" | 2 | menu "Macintosh device drivers" |
3 | depends on PPC || MAC | 3 | depends on PPC || MAC || X86 |
4 | 4 | ||
5 | config ADB | 5 | config ADB |
6 | bool "Apple Desktop Bus (ADB) support" | 6 | bool "Apple Desktop Bus (ADB) support" |