diff options
| author | David S. Miller | 2008-09-16 23:11:43 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-09-16 23:11:43 +0200 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /arch/sparc | |
| parent | sparc32: Use PROM device probing for sun4m timer registers. (diff) | |
| parent | sparc64: Fix OOPS in psycho_pcierr_intr_other(). (diff) | |
| download | kernel-qcow2-linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.tar.gz kernel-qcow2-linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.tar.xz kernel-qcow2-linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/of_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index c88af7efc335..0837bd52e28f 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c @@ -264,7 +264,7 @@ static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna) return of_bus_default_map(addr, range, na, ns, pna); } -static unsigned int of_bus_sbus_get_flags(const u32 *addr) +static unsigned long of_bus_sbus_get_flags(const u32 *addr, unsigned long flags) { return IORESOURCE_MEM; } |