diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-12 13:44:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-12 13:44:50 -0400 |
| commit | 38a00840638b4932152bca48098dbfa069d942a2 (patch) | |
| tree | dd12897854f6df8aac237d5fd46551c74be8153a /drivers/misc/Kconfig | |
| parent | 391e5c22f5f4e55817f8ba18a08ea717ed2d4a1f (diff) | |
| parent | 2f8684ce7a47c91da7e0ccba2686277c103d02b6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/misc/Kconfig')
| -rw-r--r-- | drivers/misc/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 2661f6e366f9..154f3ef07631 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
| @@ -511,7 +511,6 @@ config USB_SWITCH_FSA9480 | |||
| 511 | source "drivers/misc/c2port/Kconfig" | 511 | source "drivers/misc/c2port/Kconfig" |
| 512 | source "drivers/misc/eeprom/Kconfig" | 512 | source "drivers/misc/eeprom/Kconfig" |
| 513 | source "drivers/misc/cb710/Kconfig" | 513 | source "drivers/misc/cb710/Kconfig" |
| 514 | source "drivers/misc/iwmc3200top/Kconfig" | ||
| 515 | source "drivers/misc/ti-st/Kconfig" | 514 | source "drivers/misc/ti-st/Kconfig" |
| 516 | source "drivers/misc/lis3lv02d/Kconfig" | 515 | source "drivers/misc/lis3lv02d/Kconfig" |
| 517 | source "drivers/misc/carma/Kconfig" | 516 | source "drivers/misc/carma/Kconfig" |