VisionFive2 Linux kernel

author: John W. Linville <linville@tuxdriver.com> 2011-07-08 11:03:36 -0400 committer: John W. Linville <linville@tuxdriver.com> 2011-07-08 11:03:36 -0400 commit: 204d1641d200709c759d8c269458cbc7de378c40 parent: 31817df025e24559a01d33ddd68bd11b21bf9d7b

Commit Summary:

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Diffstat:

1 file changed, 0 insertions, 2 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 3bb154d8c8cc..258473ce8d01 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -94,8 +94,6 @@ source "drivers/memstick/Kconfig"
 
 source "drivers/leds/Kconfig"
 
-source "drivers/nfc/Kconfig"
-
 source "drivers/accessibility/Kconfig"
 
 source "drivers/infiniband/Kconfig"