lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse Source 
Conflicts:

	arch/sparc64/kernel/pci_psycho.c
This commit is contained in:
David S. Miller
2008-09-16 14:11:43 -07:00
parent 9b2e43ae4e f948cc6ab9
commit 2e57572a50
1002 changed files with 34796 additions and 10680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/kernel/of_device.c
View File

@@ -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;
}