diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 11:48:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 11:48:07 -0700 |
| commit | d210267741fb2a8b6d741d9040703683a39087f4 (patch) | |
| tree | bfc1cdf7925644367cec4c82f2a5fb6d4c51a8eb /drivers/Kconfig | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
| parent | 5bb196ad29c58c3e69dde8ed34b99a07c0719e7f (diff) | |
Merge 3.4-rc5 into staging-next
This resolves the conflict in:
drivers/staging/vt6656/ioctl.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 d236aef7e59..e245779443d 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -140,4 +140,8 @@ source "drivers/virt/Kconfig" source "drivers/devfreq/Kconfig" +source "drivers/iio/Kconfig" + +source "drivers/vme/Kconfig" + endmenu |