Skip to content

Commit

Permalink
Staging: vme: change to VME_BUS
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Sep 15, 2009
1 parent bf39f9a commit 51be979
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
4 changes: 2 additions & 2 deletions drivers/staging/vme/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vme/Makefile
Original file line number Diff line number Diff line change
@@ -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/

0 comments on commit 51be979

Please sign in to comment.