---

yaml --- r: 162348 b: refs/heads/master c: 51be979 h: refs/heads/master v: v3
git-mirror · Sep 15, 2009 · 477e368 · 477e368
1 parent 58caef5
commit 477e368
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/