Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Geert Uytterhoeven and committed by
Greg Kroah-Hartman
2e1c951f 1690e35f

-2
-2
drivers/Makefile
··· 80 80 obj-$(CONFIG_DIO) += dio/ 81 81 obj-$(CONFIG_SBUS) += sbus/ 82 82 obj-$(CONFIG_ZORRO) += zorro/ 83 - obj-$(CONFIG_MAC) += macintosh/ 84 83 obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ 85 84 obj-$(CONFIG_PARIDE) += block/paride/ 86 85 obj-$(CONFIG_TC) += tc/ ··· 137 138 138 139 obj-$(CONFIG_MAILBOX) += mailbox/ 139 140 obj-$(CONFIG_HWSPINLOCK) += hwspinlock/ 140 - obj-$(CONFIG_NFC) += nfc/ 141 141 obj-$(CONFIG_IOMMU_SUPPORT) += iommu/ 142 142 obj-$(CONFIG_REMOTEPROC) += remoteproc/ 143 143 obj-$(CONFIG_RPMSG) += rpmsg/