MIPS: EMMA: Move <asm/emma2rh> to <asm/emma> dir

[linux-2.6-omap-h63xx.git] / arch / mips / pci / ops-emma2rh.c

diff --git a/arch/mips/pci/ops-emma2rh.c b/arch/mips/pci/ops-emma2rh.c
index 38f181625e109715bc1fed265a23de95ae8d4577..5947a70b0b7fca38135209bad0e1ed33042cf09b 100644 (file)
--- a/arch/mips/pci/ops-emma2rh.c
+++ b/arch/mips/pci/ops-emma2rh.c
@@ -30,7 +30,7 @@
 #include <asm/addrspace.h>
 #include <asm/debug.h>
 
-#include <asm/emma2rh/emma2rh.h>
+#include <asm/emma/emma2rh.h>
 
 #define RTABORT (0x1<<9)
 #define RMABORT (0x1<<10)
@@ -45,7 +45,7 @@ static int check_args(struct pci_bus *bus, u32 devfn, u32 * bus_num)
        /* check if the bus is top-level */
        if (bus->parent != NULL) {
                *bus_num = bus->number;
-               db_assert(bus_num != 0);
+               db_assert(bus_num != NULL);
        } else
                *bus_num = 0;