diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 11:22:08 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 11:22:08 +1000 |
| commit | b71a107c66ad952c9d35ec046a803efc89a80556 (patch) | |
| tree | eb1f77af4f14974ba40a413d7679b3a451295a3d /arch/powerpc/platforms/512x/mpc512x.h | |
| parent | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (diff) | |
| parent | e7c5a4f292e0d1f4ba9a3a94b2c8e8b71e35b25a (diff) | |
| download | kernel_samsung_smdk4412-b71a107c66ad952c9d35ec046a803efc89a80556.zip kernel_samsung_smdk4412-b71a107c66ad952c9d35ec046a803efc89a80556.tar.gz kernel_samsung_smdk4412-b71a107c66ad952c9d35ec046a803efc89a80556.tar.bz2 | |
Merge commit 'gcl/merge' into next
Manual merge of:
drivers/net/fec_mpc52xx.c
Diffstat (limited to 'arch/powerpc/platforms/512x/mpc512x.h')
| -rw-r--r-- | arch/powerpc/platforms/512x/mpc512x.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/512x/mpc512x.h b/arch/powerpc/platforms/512x/mpc512x.h index 9c03693..22a5352 100644 --- a/arch/powerpc/platforms/512x/mpc512x.h +++ b/arch/powerpc/platforms/512x/mpc512x.h @@ -11,7 +11,6 @@ #ifndef __MPC512X_H__ #define __MPC512X_H__ -extern unsigned long mpc512x_find_ips_freq(struct device_node *node); extern void __init mpc512x_init_IRQ(void); void __init mpc512x_declare_of_platform_devices(void); #endif /* __MPC512X_H__ */ |