diff options
| 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 (patch) | |
| tree | ce88690b4422078883f1651537ccd1f5d8ed7258 /drivers/Kconfig | |
| parent | 31817df025e24559a01d33ddd68bd11b21bf9d7b (diff) | |
| parent | 5f0dd296a01c8173fcc05a8b262a1168ae90bc74 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 2 |
1 files 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" | |||
| 94 | 94 | ||
| 95 | source "drivers/leds/Kconfig" | 95 | source "drivers/leds/Kconfig" |
| 96 | 96 | ||
| 97 | source "drivers/nfc/Kconfig" | ||
| 98 | |||
| 99 | source "drivers/accessibility/Kconfig" | 97 | source "drivers/accessibility/Kconfig" |
| 100 | 98 | ||
| 101 | source "drivers/infiniband/Kconfig" | 99 | source "drivers/infiniband/Kconfig" |