diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-03-18 16:06:37 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-18 16:06:37 +0100 |
commit | b44ce3b0f9c3883e7c537793b808feee9a2a00fb (patch) | |
tree | 19ff25fe5efadb0129008f406e2df9661e5bb1fb /arch/arm/mach-s3c64xx | |
parent | ARM: mmp: allow platform devices with modular USB (diff) | |
parent | ARM: S3C64XX: mach-crag6410-module.c is not modular (diff) | |
download | linux-dev-b44ce3b0f9c3883e7c537793b808feee9a2a00fb.tar.xz linux-dev-b44ce3b0f9c3883e7c537793b808feee9a2a00fb.zip |
Merge tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical
Merge "Samsung non-critical fixes for v3.15" from Kukjin Kim:
- fix typo CONFIG_CPU_S3C2443 in Kconfig
- fix G3D regulator on because of entering low power mode
for exynos5250-arndale
- fix CONFIG_USB_EHCI_EXYNOS for exynos_defconfig
- fix initcall of mach-crag6410-module.c
* tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C64XX: mach-crag6410-module.c is not modular
ARM: exynos_defconfig: Update EHCI config entry
ARM: dts: Keep G3D regulator always on for exynos5250-arndale
ARM: S3C24XX: Fix typo CONFIG_CPUS_3C2443
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c index 7ccfef227c77..9c00d83f7151 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c @@ -401,4 +401,4 @@ static int __init wlf_gf_module_register(void) { return i2c_add_driver(&wlf_gf_module_driver); } -module_init(wlf_gf_module_register); +device_initcall(wlf_gf_module_register); |