diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 13:42:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 13:42:28 -0700 |
commit | 55663219378eecd6fccb319be27ce6737a535e4c (patch) | |
tree | ff20fe50fa2e86ba09677a8b2cc7462ea11347a6 /arch/powerpc/platforms/chrp/pegasos_eth.c | |
parent | a43266355b3d8cf6717a27159f9a417bdff73782 (diff) | |
parent | 58da10bb3fe680a197e83d5eccb5265a721c98e2 (diff) |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
* 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
[POWERPC] Fix Kconfig warning
[PPC] Fix modpost warning
[POWERPC] Fix modpost warning
[POWERPC] Fix Section mismatch warnings
[POWERPC] QE: fix Kconfig 'select' warning with UCC_FAST
[POWERPC] 52xx: unbreak lite5200 dts (_pic vs. -pic)
[PPC] Remove duplicate export of __div64_32.
[PPC] Fix COMMON symbol warnings
Diffstat (limited to 'arch/powerpc/platforms/chrp/pegasos_eth.c')
-rw-r--r-- | arch/powerpc/platforms/chrp/pegasos_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/chrp/pegasos_eth.c b/arch/powerpc/platforms/chrp/pegasos_eth.c index 71045677559..5bcc58d9a4d 100644 --- a/arch/powerpc/platforms/chrp/pegasos_eth.c +++ b/arch/powerpc/platforms/chrp/pegasos_eth.c @@ -169,7 +169,7 @@ static int Enable_SRAM(void) /***********/ /***********/ -int mv643xx_eth_add_pds(void) +static int __init mv643xx_eth_add_pds(void) { int ret = 0; static struct pci_device_id pci_marvell_mv64360[] = { |