diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 14:48:58 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 14:48:58 +0200 |
| commit | d925ef43869a2da86444e3f68ebe9ce81efaa0c6 (patch) | |
| tree | ed1c2e19977008240a295c4ebb4b8b6c87e4f588 /arch/arm/mach-ux500/board-mop500.h | |
| parent | Merge tag 's3c24xx-pinctrl-2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ARM: ux500: Remove mop500_snowball_ethernet_clock_enable() (diff) | |
| download | linux-d925ef43869a2da86444e3f68ebe9ce81efaa0c6.tar.xz linux-d925ef43869a2da86444e3f68ebe9ce81efaa0c6.zip | |
Merge branch 'ux500/cleanup' into next/drivers
Patches from Lee Jones:
This gets rid of mop500_snowball_ethernet_clock_enable() which is no
longer in use. It also straightens out a bug which ensures the SMSC911x's
regulator is turned on at start-up when using Device Tree.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.h')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index 6f0bfcb08907..d6fab166cbf1 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -105,7 +105,6 @@ void __init mop500_pinmaps_init(void); void __init snowball_pinmaps_init(void); void __init hrefv60_pinmaps_init(void); void mop500_audio_init(struct device *parent); -void mop500_snowball_ethernet_clock_enable(void); int __init mop500_uib_init(void); void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info, |