diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-10-04 13:54:30 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-10-04 13:54:30 -0700 |
| commit | 3ae3e253db7385238dd9d6c67c085afa3e770a56 (patch) | |
| tree | c3f93d9742c4654c9d10af829db1122bac0b6f6f /arch/arm/mach-omap2/gpio.c | |
| parent | c541c15fb5ab48c47bc9b90121538fd30d152f23 (diff) | |
| parent | 476b679a5d785d1244f6b43ad26877acf278cd18 (diff) | |
Merge branch 'for_3.2/3_omap_devicetree' of git://gitorious.org/omap-pm/linux into dt
Diffstat (limited to 'arch/arm/mach-omap2/gpio.c')
| -rw-r--r-- | arch/arm/mach-omap2/gpio.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 652ccc574196..8cbfbc2918ce 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c @@ -24,14 +24,6 @@ #include <plat/omap_hwmod.h> #include <plat/omap_device.h> -static struct omap_device_pm_latency omap_gpio_latency[] = { - [0] = { - .deactivate_func = omap_device_idle_hwmods, - .activate_func = omap_device_enable_hwmods, - .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, - }, -}; - static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) { struct platform_device *pdev; @@ -108,9 +100,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) } pdev = omap_device_build(name, id - 1, oh, pdata, - sizeof(*pdata), omap_gpio_latency, - ARRAY_SIZE(omap_gpio_latency), - false); + sizeof(*pdata), NULL, 0, false); kfree(pdata); if (IS_ERR(pdev)) { |