diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-10 18:08:09 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-10 18:08:09 +0100 |
| commit | e65bc8918f75620f1668d321b048bfa336ccc0fa (patch) | |
| tree | 72ec2d6e5848d7ce3a2f012daf85bc08df43e49d /arch/arm/mach-omap2/gpio.c | |
| parent | Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Merge branch 'for_3.4/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-e65bc8918f75620f1668d321b048bfa336ccc0fa.tar.xz linux-e65bc8918f75620f1668d321b048bfa336ccc0fa.zip | |
Merge branch 'cleanup-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
* 'cleanup-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: PM: share some suspend-related functions across OMAP2, 3, 4
ARM: OMAP2+: omap_device: call all suspend, resume callbacks when OMAP_DEVICE_NO_IDLE_ON_SUSPEND is set
ARM: OMAP: omap_device: remove omap_device_parent
ARM: OMAP2+: PM debug: fix the use of debugfs_create_* API
ARM: OMAP2+: PM: share clkdms_setup() across OMAP2, 3, 4
ARM: OMAP2+: PM: clean up omap_set_pwrdm_state()
ARM: OMAP3: PM: remove superfluous calls to pwrdm_clear_all_prev_pwrst()
ARM: OMAP: convert omap_device_build() and callers to __init
ARM: OMAP2+: Mark omap_hsmmc_init and omap_mux related functions as __init
ARM: OMAP2+: Split omap2_hsmmc_init() to properly support I2C GPIO pins
ARM: OMAP: omap_device: Expose omap_device_{alloc, delete, register}
ARM: OMAP: Fix build error when mmc_omap is built as module
ARM: OMAP: Fix kernel panic with HSMMC when twl4030_gpio is a module
Diffstat (limited to 'arch/arm/mach-omap2/gpio.c')
| -rw-r--r-- | arch/arm/mach-omap2/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 1e0b750afcaa..2f994e5194e8 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c @@ -27,7 +27,7 @@ #include "powerdomain.h" -static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) +static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) { struct platform_device *pdev; struct omap_gpio_platform_data *pdata; |