diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-01-05 14:23:52 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-05 14:23:52 +0000 |
| commit | aa455d7ac286733058f10ee7d69f581782097c89 (patch) | |
| tree | fb7f05b2ba65587728860787c4aaa0cf38ad81f8 /drivers/Kconfig | |
| parent | bb85ecd7363b4ccfaa72aadec4bc992b0fe9e885 (diff) | |
| parent | f10e001c618eb438d80ed4183b25d13a48f61dbb (diff) | |
Automatically merging tracking-igloo_kernel-other into merging-integration-android-ux500
Conflicting files:
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 9772807a8d6..ee92091ad73 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -98,6 +98,10 @@ source "drivers/memstick/Kconfig" source "drivers/leds/Kconfig" +source "drivers/nfc/Kconfig" + +source "drivers/switch/Kconfig" + source "drivers/accessibility/Kconfig" source "drivers/infiniband/Kconfig" |