x86: integrate pci-dma.c
authorGlauber Costa <gcosta@redhat.com>
Wed, 9 Apr 2008 16:18:10 +0000 (13:18 -0300)
committerIngo Molnar <mingo@elte.hu>
Sat, 19 Apr 2008 17:19:58 +0000 (19:19 +0200)
commit098cb7f27ed69276e4db560a444b94b982e4bb8f
tree6c6a26d9423d3320632e0fd029d9244a07e760da
parentbb8ada95a7c11adf3dad4e8d5c55ef1650560592
x86: integrate pci-dma.c

The code in pci-dma_{32,64}.c are now sufficiently
close to each other. We merge them in pci-dma.c.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/Makefile
arch/x86/kernel/pci-dma.c
arch/x86/kernel/pci-dma_32.c [deleted file]
arch/x86/kernel/pci-dma_64.c [deleted file]