Commit 51be9796 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bf39f9a5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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/
+2 −2
Original line number Diff line number Diff line
@@ -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"

+1 −1
Original line number Diff line number Diff line
#
# Makefile for the VME bridge device drivers.
#
obj-$(CONFIG_VME)		+= vme.o
obj-$(CONFIG_VME_BUS)		+= vme.o

obj-y				+= bridges/
obj-y				+= devices/