From 477e3682f61f9d2cf258ecc45d0c7f83a9afba78 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 11 Sep 2009 09:51:31 -0700
Subject: [PATCH] --- yaml --- r: 162348 b: refs/heads/master c:
 51be97961fc74de75e9e30a7339804afb77c7b1e h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/staging/Makefile     | 2 +-
 trunk/drivers/staging/vme/Kconfig  | 4 ++--
 trunk/drivers/staging/vme/Makefile | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 403b2166bbd3..03d95fa43af6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf39f9a5bdcfdce2e4871cdb8f4219ea5f32f3c8
+refs/heads/master: 51be97961fc74de75e9e30a7339804afb77c7b1e
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
index 42c6776ed5fb..0bf10ac04d07 100644
--- a/trunk/drivers/staging/Makefile
+++ b/trunk/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/trunk/drivers/staging/vme/Kconfig b/trunk/drivers/staging/vme/Kconfig
index e030805269c5..ae628a58b0c6 100644
--- a/trunk/drivers/staging/vme/Kconfig
+++ b/trunk/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/trunk/drivers/staging/vme/Makefile b/trunk/drivers/staging/vme/Makefile
index 3dccbab348c9..8c3b90ee5853 100644
--- a/trunk/drivers/staging/vme/Makefile
+++ b/trunk/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/