diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:45:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:45:42 -0700 |
| commit | 344a7829c421ce6c626cb94c6576f66a7c28a871 (patch) | |
| tree | fee700ededa9c7962605b611379328aeb0579de1 /arch/sparc/kernel/of_device.c | |
| parent | 8e82f8c34b1759ae0d80fe96101746ec51fb1ba4 (diff) | |
| parent | 7d4ee289d139d27b619c08c9809e7b1088c100aa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Fix user_regset 'n' field values.
sparc64: Fix PCI error interrupt registry on PSYCHO.
sparc32: Fix function signature of of_bus_sbus_get_flags().
sparc64: Fix interrupt register calculations on Psycho and Sabre.
Diffstat (limited to 'arch/sparc/kernel/of_device.c')
| -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 c481d45f97b7..f58c537446a8 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c @@ -241,7 +241,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; } |