git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://github.com/rustyrussell/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
gpio.c
diff --git
a/arch/arm/mach-omap2/gpio.c
b/arch/arm/mach-omap2/gpio.c
index
652ccc5
..
8cbfbc2
100644
(file)
--- 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>
#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;
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,
}
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)) {
kfree(pdata);
if (IS_ERR(pdev)) {