aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-09-11 09:51:31 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:11 -0700
commit51be97961fc74de75e9e30a7339804afb77c7b1e (patch)
treeb4a8ff5f98df6d81cb86640e6e57505e7c7ab9cd /drivers/staging
parentbf39f9a5bdcfdce2e4871cdb8f4219ea5f32f3c8 (diff)
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/Makefile2
-rw-r--r--drivers/staging/vme/Kconfig4
-rw-r--r--drivers/staging/vme/Makefile2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 42c6776ed5fb..0bf10ac04d07 100644
--- 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 e030805269c5..ae628a58b0c6 100644
--- 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 3dccbab348c9..8c3b90ee5853 100644
--- 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/

Privacy Policy