diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-02 18:31:08 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-02 18:31:08 +1000 |
| commit | 7a9cdd95fe153f86d23f63811ad4ba0ab32dad57 (patch) | |
| tree | 4fdeea6571fbf10e59fd32cbcb9c977858791808 /arch/powerpc/include/asm | |
| parent | dd8164c1dd7f511aa362f548fd8c4882bee3fd54 (diff) | |
| parent | dd0120dea601de654a5a6d959da3a632a02200f0 (diff) | |
| download | op-kernel-dev-7a9cdd95fe153f86d23f63811ad4ba0ab32dad57.zip op-kernel-dev-7a9cdd95fe153f86d23f63811ad4ba0ab32dad57.tar.gz | |
Merge remote-tracking branch 'agust/next' into next
From Anatolij:
"There are small cleanups and fixes for mpc512x common code,
mpc512x_defconfig updates and soft reboot support for mpc5125
based boards."
Diffstat (limited to 'arch/powerpc/include/asm')
| -rw-r--r-- | arch/powerpc/include/asm/mpc5121.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/mpc5121.h b/arch/powerpc/include/asm/mpc5121.h index 885c040..8ae133e 100644 --- a/arch/powerpc/include/asm/mpc5121.h +++ b/arch/powerpc/include/asm/mpc5121.h @@ -68,6 +68,5 @@ struct mpc512x_lpc { }; int mpc512x_cs_config(unsigned int cs, u32 val); -int __init mpc5121_clk_init(void); #endif /* __ASM_POWERPC_MPC5121_H__ */ |
