Browse Source

powerpc/pseries: Move vio.c into platforms pseries

vio.c is pseries only code, so move it in there.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Michael Ellerman 8 years ago
parent
commit
139ac5afe3

+ 0 - 1
arch/powerpc/kernel/Makefile

@@ -58,7 +58,6 @@ obj-$(CONFIG_PPC_RTAS)		+= rtas.o rtas-rtc.o $(rtaspci-y-y)
 obj-$(CONFIG_PPC_RTAS_DAEMON)	+= rtasd.o
 obj-$(CONFIG_PPC_RTAS_DAEMON)	+= rtasd.o
 obj-$(CONFIG_RTAS_FLASH)	+= rtas_flash.o
 obj-$(CONFIG_RTAS_FLASH)	+= rtas_flash.o
 obj-$(CONFIG_RTAS_PROC)		+= rtas-proc.o
 obj-$(CONFIG_RTAS_PROC)		+= rtas-proc.o
-obj-$(CONFIG_IBMVIO)		+= vio.o
 obj-$(CONFIG_IBMEBUS)           += ibmebus.o
 obj-$(CONFIG_IBMEBUS)           += ibmebus.o
 obj-$(CONFIG_EEH)              += eeh.o eeh_pe.o eeh_dev.o eeh_cache.o \
 obj-$(CONFIG_EEH)              += eeh.o eeh_pe.o eeh_dev.o eeh_cache.o \
 				  eeh_driver.o eeh_event.o eeh_sysfs.o
 				  eeh_driver.o eeh_event.o eeh_sysfs.o

+ 0 - 5
arch/powerpc/platforms/Kconfig

@@ -168,11 +168,6 @@ config MPIC_BROKEN_REGREAD
 	  well, but enabling it uses about 8KB of memory to keep copies
 	  well, but enabling it uses about 8KB of memory to keep copies
 	  of the register contents in software.
 	  of the register contents in software.
 
 
-config IBMVIO
-	depends on PPC_PSERIES
-	bool
-	default y
-
 config IBMEBUS
 config IBMEBUS
 	depends on PPC_PSERIES
 	depends on PPC_PSERIES
 	bool "Support for GX bus based adapters"
 	bool "Support for GX bus based adapters"

+ 5 - 0
arch/powerpc/platforms/pseries/Kconfig

@@ -127,3 +127,8 @@ config HV_PERF_CTRS
 	  systems. 24x7 is available on Power 8 systems.
 	  systems. 24x7 is available on Power 8 systems.
 
 
           If unsure, select Y.
           If unsure, select Y.
+
+config IBMVIO
+	depends on PPC_PSERIES
+	bool
+	default y

+ 1 - 0
arch/powerpc/platforms/pseries/Makefile

@@ -21,6 +21,7 @@ obj-$(CONFIG_CMM)		+= cmm.o
 obj-$(CONFIG_DTL)		+= dtl.o
 obj-$(CONFIG_DTL)		+= dtl.o
 obj-$(CONFIG_IO_EVENT_IRQ)	+= io_event_irq.o
 obj-$(CONFIG_IO_EVENT_IRQ)	+= io_event_irq.o
 obj-$(CONFIG_LPARCFG)		+= lparcfg.o
 obj-$(CONFIG_LPARCFG)		+= lparcfg.o
+obj-$(CONFIG_IBMVIO)		+= vio.o
 
 
 ifeq ($(CONFIG_PPC_PSERIES),y)
 ifeq ($(CONFIG_PPC_PSERIES),y)
 obj-$(CONFIG_SUSPEND)		+= suspend.o
 obj-$(CONFIG_SUSPEND)		+= suspend.o

+ 0 - 0
arch/powerpc/kernel/vio.c → arch/powerpc/platforms/pseries/vio.c