From 51be97961fc74de75e9e30a7339804afb77c7b1e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 11 Sep 2009 09:51:31 -0700
Subject: 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>
---
 drivers/staging/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/staging/Makefile')

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/
-- 
cgit v1.2.3