diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 19:36:40 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 19:36:40 +0400 |
commit | 31e918908ccaf2b651ed8f666120f2a03a97193f (patch) | |
tree | 39aab36ced1932d06cb2e3cee037faae0b94a63b /arch/arm/mach-ux500/board-mop500.h | |
parent | ae3759c2573031f1306496c6f9f32f20e86f03aa (diff) | |
parent | 31880c37c11e28cb81c70757e38392b42e695dc6 (diff) | |
download | linux-31e918908ccaf2b651ed8f666120f2a03a97193f.tar.xz |
Merge 3.9-rc6 into usb-next
We want the fixes here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.h')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index eaa605f5d90d..d38951be70df 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -104,6 +104,7 @@ 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, |