diff --git a/[refs] b/[refs] index b384909a4771..93d2db102791 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 835d90c4218dffe6f9e7ac1ed79795197a4970c4 +refs/heads/master: 45941d0481f538324fa21d6450116d13f6e51e91 diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile index 0dd96d1afd39..f28dcb4ec8b3 100644 --- a/trunk/drivers/Makefile +++ b/trunk/drivers/Makefile @@ -30,7 +30,7 @@ obj-$(CONFIG_PARPORT) += parport/ obj-y += base/ block/ misc/ mfd/ net/ media/ obj-$(CONFIG_NUBUS) += nubus/ obj-$(CONFIG_ATM) += atm/ -obj-$(CONFIG_PPC_PMAC) += macintosh/ +obj-y += macintosh/ obj-$(CONFIG_IDE) += ide/ obj-$(CONFIG_FC4) += fc4/ obj-$(CONFIG_SCSI) += scsi/ diff --git a/trunk/drivers/macintosh/Kconfig b/trunk/drivers/macintosh/Kconfig index a9e747c39791..1a86387e23be 100644 --- a/trunk/drivers/macintosh/Kconfig +++ b/trunk/drivers/macintosh/Kconfig @@ -1,6 +1,6 @@ menu "Macintosh device drivers" - depends on PPC || MAC + depends on PPC || MAC || X86 config ADB bool "Apple Desktop Bus (ADB) support"