2 files changed, 3 insertions, 6 deletions

diff --git a/arch/mips/pci/fixup-au1000.c b/arch/mips/pci/fixup-au1000.c
index ca0276c8070a..00c36c9dbe0e 100644
--- a/arch/mips/pci/fixup-au1000.c
+++ b/arch/mips/pci/fixup-au1000.c
@@ -26,13 +26,10 @@
  *  with this program; if not, write  to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <linux/types.h>
+
 #include <linux/pci.h>
-#include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <asm/mach-au1x00/au1000.h>
-
 extern char irq_tab_alchemy[][5];
 
 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
diff --git a/arch/mips/pci/ops-pnx8550.c b/arch/mips/pci/ops-pnx8550.c
index d61064652498..0e160d9f07c3 100644
--- a/arch/mips/pci/ops-pnx8550.c
+++ b/arch/mips/pci/ops-pnx8550.c
@@ -90,14 +90,14 @@ config_access(unsigned int pci_cmd, struct pci_bus *bus, unsigned int devfn, int
 
                 loops--;
                 if (loops == 0) {
-                        printk("%s : Arbiter Locked.\n", __FUNCTION__);
+                        printk("%s : Arbiter Locked.\n", __func__);
                 }
         }
 
         clear_status();
         if ((pci_cmd == PCI_CMD_IOR) || (pci_cmd == PCI_CMD_IOW)) {
                 printk("%s timeout (GPPM_CTRL=%X) ioaddr %lX pci_cmd %X\n",
-                       __FUNCTION__, inl(PCI_BASE | PCI_GPPM_CTRL), ioaddr,
+                       __func__, inl(PCI_BASE | PCI_GPPM_CTRL), ioaddr,
                        pci_cmd);
         }