summaryrefslogtreecommitdiff
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-05-08 16:09:32 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-28 01:42:20 +0400
commit2e1c951f5da23faaa60224628f44b100ab212d46 (patch)
treed4f849540e795d0189e7bcf0e128cb2eba18c122 /drivers/Makefile
parent1690e35f9b95e0efe063d76a7ab485db3e8d3bc5 (diff)
downloadlinux-2e1c951f5da23faaa60224628f44b100ab212d46.tar.xz
drivers: Remove duplicate conditionally included subdirs
The "macintosh" and "nfs" subdirectories are already traversed unconditionally, so there's no need to keep the conditional entries. The unconditional "macintosh" entry used to depend on CONFIG_PPC_PMAC, but the dependency was dropped in commit 45941d0481f538324fa21d6450116d13f6e51e91 ("[PATCH] enable mouse button 2+3 emulation for x86 macs"), forgetting the second entry for CONFIG_MAC. The two "nfc" entries were introduced by two separate commits: commit 0329326e85aaa30fb8d427828c718d565c287385 ("NFC: Driver for NXP Semiconductors PN544 NFC chip."), and commit 3e256b8f8dfa309a80b5dece388d85d9a9801a29 ("NFC: add nfc subsystem core"). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index d05d81b19b50..da72e328f775 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -80,7 +80,6 @@ obj-$(CONFIG_PCCARD) += pcmcia/
obj-$(CONFIG_DIO) += dio/
obj-$(CONFIG_SBUS) += sbus/
obj-$(CONFIG_ZORRO) += zorro/
-obj-$(CONFIG_MAC) += macintosh/
obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/
obj-$(CONFIG_PARIDE) += block/paride/
obj-$(CONFIG_TC) += tc/
@@ -138,7 +137,6 @@ obj-y += clk/
obj-$(CONFIG_MAILBOX) += mailbox/
obj-$(CONFIG_HWSPINLOCK) += hwspinlock/
-obj-$(CONFIG_NFC) += nfc/
obj-$(CONFIG_IOMMU_SUPPORT) += iommu/
obj-$(CONFIG_REMOTEPROC) += remoteproc/
obj-$(CONFIG_RPMSG) += rpmsg/