]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 85e568e) | patch
powerpc: Merge arch/ppc64/kernel/vio.c into arch/powerpc/kernel/vio.c
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 24 Oct 2005 04:22:37 +0000 (14:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 24 Oct 2005 05:41:44 +0000 (15:41 +1000)
commit580460194e0e647d95cb5a2b66fdd7497b197f92
treebce8e2c26e02c01210f6aa82fed9a9772bdf6fd6tree | snapshot
parent85e568ea5843d455a0bcb682ad2c71abb50bdb80commit | 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>
arch/powerpc/kernel/Makefile diff | blob | history
arch/powerpc/kernel/vio.c [moved from arch/ppc64/kernel/vio.c with 100% similarity] blob | history
arch/ppc64/kernel/Makefile diff | blob | history
Linux 2.6 source tree