Staging: vme: change to VME_BUS

Turns out the m68k arch already has a CONFIG_VME, so use
CONFIG_VME_BUS instead.

Thanks to Geet Uytterhoeven for pointing this out.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 42c6776ed5fbf2aaf6d3ab66116762f6a056b729..0bf10ac04d07e7e5cbbd2aa5be23c886cca3e53d 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -50,4 +50,4 @@ obj-$(CONFIG_USB_CPC)         += cpc-usb/
 obj-$(CONFIG_RDC_17F3101X)     += pata_rdc/
 obj-$(CONFIG_FB_UDL)           += udlfb/
 obj-$(CONFIG_HYPERV)           += hv/
-obj-$(CONFIG_VME)              += vme/
+obj-$(CONFIG_VME_BUS)          += vme/

diff --git a/drivers/staging/vme/Kconfig b/drivers/staging/vme/Kconfig
index e030805269c51001cace4a79f226f34f86dfc4a4..ae628a58b0c6312d953cb0b34f1f87343d9263eb 100644 (file)
--- a/drivers/staging/vme/Kconfig
+++ b/drivers/staging/vme/Kconfig
@@ -2,13 +2,13 @@
 # VME configuration.
 #
 
-menuconfig VME
+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
+if VME_BUS
 
 source "drivers/staging/vme/bridges/Kconfig"
 

diff --git a/drivers/staging/vme/Makefile b/drivers/staging/vme/Makefile
index 3dccbab348c9a0e0346dbeb1b58d9b246ff4b81d..8c3b90ee5853e160e8ef234932effb8346e5c10f 100644 (file)
--- a/drivers/staging/vme/Makefile
+++ b/drivers/staging/vme/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the VME bridge device drivers.
 #
-obj-$(CONFIG_VME)              += vme.o
+obj-$(CONFIG_VME_BUS)          += vme.o
 
 obj-y                          += bridges/
 obj-y                          += devices/