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

2011-07-08 11:03:36 -04:00
--- 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"