diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /arch/arm/mach-pxa/tosa.c | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'arch/arm/mach-pxa/tosa.c')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 58ce807fe440..117ad5920e53 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #include <mach/pxa25x.h> | 39 | #include <mach/pxa25x.h> |
| 40 | #include <mach/reset.h> | 40 | #include <mach/reset.h> |
| 41 | #include <mach/irda.h> | 41 | #include <mach/irda.h> |
| 42 | #include <mach/i2c.h> | 42 | #include <plat/i2c.h> |
| 43 | #include <mach/mmc.h> | 43 | #include <mach/mmc.h> |
| 44 | #include <mach/udc.h> | 44 | #include <mach/udc.h> |
| 45 | #include <mach/tosa_bt.h> | 45 | #include <mach/tosa_bt.h> |
| @@ -896,7 +896,7 @@ static void __init tosa_init(void) | |||
| 896 | gpio_set_wake(MFP_PIN_GPIO1, 1); | 896 | gpio_set_wake(MFP_PIN_GPIO1, 1); |
| 897 | /* We can't pass to gpio-keys since it will drop the Reset altfunc */ | 897 | /* We can't pass to gpio-keys since it will drop the Reset altfunc */ |
| 898 | 898 | ||
| 899 | init_gpio_reset(TOSA_GPIO_ON_RESET, 0); | 899 | init_gpio_reset(TOSA_GPIO_ON_RESET, 0, 0); |
| 900 | 900 | ||
| 901 | pm_power_off = tosa_poweroff; | 901 | pm_power_off = tosa_poweroff; |
| 902 | arm_pm_restart = tosa_restart; | 902 | arm_pm_restart = tosa_restart; |