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
45941d04 ("[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
0329326e ("NFC: Driver for NXP
Semiconductors PN544 NFC chip."), and commit
3e256b8f ("NFC: add nfc subsystem core").
Signed-off-by: NGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>