diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-24 00:22:37 -0400 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-24 01:41:44 -0400 |
| commit | 580460194e0e647d95cb5a2b66fdd7497b197f92 (patch) | |
| tree | bce8e2c26e02c01210f6aa82fed9a9772bdf6fd6 /arch/ppc64/kernel/Makefile | |
| parent | 85e568ea5843d455a0bcb682ad2c71abb50bdb80 (diff) | |
powerpc: Merge arch/ppc64/kernel/vio.c into arch/powerpc/kernel/vio.c
Merge arch/ppc64/kernel/vio.c into arch/powerpc/kernel/vio.c, update
the Makefiles to make it work, and make ARCH=ppc64 still work.
Michael's version put vio.c in arch/powerpc/sysedv but after consolting
Paulus, this one puts it in arch/powerpc/kernel.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/ppc64/kernel/Makefile')
| -rw-r--r-- | arch/ppc64/kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index 424dd250cd87..ce5c99db431f 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
| @@ -53,7 +53,6 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o | |||
| 53 | endif | 53 | endif |
| 54 | obj-$(CONFIG_HVCS) += hvcserver.o | 54 | obj-$(CONFIG_HVCS) += hvcserver.o |
| 55 | 55 | ||
| 56 | obj-$(CONFIG_IBMVIO) += vio.o | ||
| 57 | obj-$(CONFIG_XICS) += xics.o | 56 | obj-$(CONFIG_XICS) += xics.o |
| 58 | 57 | ||
| 59 | obj-$(CONFIG_PPC_PMAC) += udbg_scc.o | 58 | obj-$(CONFIG_PPC_PMAC) += udbg_scc.o |