projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for_linus-3.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jwess...
[linux-2.6-microblaze.git]
/
arch
/
mips
/
ath79
/
mach-ap136.c
diff --git
a/arch/mips/ath79/mach-ap136.c
b/arch/mips/ath79/mach-ap136.c
index
479dd4b
..
07eac58
100644
(file)
--- a/
arch/mips/ath79/mach-ap136.c
+++ b/
arch/mips/ath79/mach-ap136.c
@@
-132,7
+132,7
@@
static void __init ap136_pci_init(u8 *eeprom)
ath79_register_pci();
}
#else
-static inline void ap136_pci_init(
void
) {}
+static inline void ap136_pci_init(
u8 *eeprom
) {}
#endif /* CONFIG_PCI */
static void __init ap136_setup(void)