Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-drm-fsl-dcu.git] / arch / ppc / syslib / m8260_pci_erratum9.c

diff --git a/arch/ppc/syslib/m8260_pci_erratum9.c b/arch/ppc/syslib/m8260_pci_erratum9.c
index 99e4bc0e42af00b0c7b99b440ccb9f44ac425766..ebb8c8f8f30c4886c28214c9a5eea905c82e9f35 100644 (file)
--- a/arch/ppc/syslib/m8260_pci_erratum9.c
+++ b/arch/ppc/syslib/m8260_pci_erratum9.c
@@ -15,7 +15,6 @@
  * or implied.
  */
 #include <linux/kernel.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/types.h>
@@ -106,7 +105,8 @@ void idma_pci9_init(void)
        idma_reg[IDMA_CHAN].idmr = 0;           /* mask all IDMA interrupts */
        idma_reg[IDMA_CHAN].idsr = 0xff;        /* clear all event flags */
 
-       printk("<4>Using IDMA%d for MPC8260 device erratum PCI 9 workaround\n",
+       printk(KERN_WARNING
+               "Using IDMA%d for MPC8260 device erratum PCI 9 workaround\n",
                IDMA_CHAN + 1);
 
        return;
@@ -340,20 +340,6 @@ void insl(unsigned port, void *buf, int nl)
        idma_pci9_read((u8 *)buf, (u8 *)addr, nl*sizeof(u32), sizeof(u32), 0);
 }
 
-void insw_ns(unsigned port, void *buf, int ns)
-{
-       u8 *addr = (u8 *)(port + _IO_BASE);
-
-       idma_pci9_read((u8 *)buf, (u8 *)addr, ns*sizeof(u16), sizeof(u16), 0);
-}
-
-void insl_ns(unsigned port, void *buf, int nl)
-{
-       u8 *addr = (u8 *)(port + _IO_BASE);
-
-       idma_pci9_read((u8 *)buf, (u8 *)addr, nl*sizeof(u32), sizeof(u32), 0);
-}
-
 void *memcpy_fromio(void *dest, unsigned long src, size_t count)
 {
        unsigned long pa = iopa((unsigned long) src);
@@ -374,8 +360,6 @@ EXPORT_SYMBOL(inl);
 EXPORT_SYMBOL(insb);
 EXPORT_SYMBOL(insw);
 EXPORT_SYMBOL(insl);
-EXPORT_SYMBOL(insw_ns);
-EXPORT_SYMBOL(insl_ns);
 EXPORT_SYMBOL(memcpy_fromio);
 
 #endif /* ifdef CONFIG_8260_PCI9 */