]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit96258d479875ec0aaa6ee16edca2d5ae7c12c8b8
treebce8e2c26e02c01210f6aa82fed9a9772bdf6fd6
parent0a62f601e1f76925c0128141c19c0b54f34844f7
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
arch/powerpc/kernel/vio.c [new file with mode: 0644]
arch/ppc64/kernel/Makefile
arch/ppc64/kernel/vio.c [deleted file]