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/vme/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/vme/Kconfig')
| -rw-r--r-- | drivers/vme/Kconfig | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/vme/Kconfig b/drivers/vme/Kconfig new file mode 100644 index 00000000000..c5c22465a80 --- /dev/null +++ b/drivers/vme/Kconfig @@ -0,0 +1,19 @@ +# +# VME configuration. +# + +menuconfig VME_BUS + tristate "VME bridge support" + depends on PCI + ---help--- + If you say Y here you get support for the VME bridge Framework. + +if VME_BUS + +source "drivers/vme/bridges/Kconfig" + +source "drivers/vme/boards/Kconfig" + +source "drivers/staging/vme/devices/Kconfig" + +endif # VME |