diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 08:17:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 08:17:34 +0100 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /arch/mips/pci/ops-emma2rh.c | |
| parent | pci: use pci_ioremap_bar() in drivers/net (diff) | |
| parent | xfrm: do not leak ESRCH to user space (diff) | |
| download | linux-a1744d3bee19d3b9cbfb825ab316a101b9c9f109.tar.xz linux-a1744d3bee19d3b9cbfb825ab316a101b9c9f109.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'arch/mips/pci/ops-emma2rh.c')
| -rw-r--r-- | arch/mips/pci/ops-emma2rh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/ops-emma2rh.c b/arch/mips/pci/ops-emma2rh.c index d31bfc6d4150..5947a70b0b7f 100644 --- 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) |