diff options
| author | kevin shen <b00984@freescale.com> | 2008-04-25 11:23:15 +0800 |
|---|---|---|
| committer | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2008-08-25 15:21:03 -0400 |
| commit | 84596df6e8b8bc7976c2cbcba4249bdbcd3eca91 (patch) | |
| tree | 7f3617a6e1361f0873ef6266202475b1d53fd8ff | |
| parent | 0d32c2690d03dbdcd84eb3b95e7499fd73e53724 (diff) | |
ENGR00074255 CR fix compile error
fix compile error for mx27/mx31/mxc91321
Signed-off-by: Kevin Shen <b00984@freescale.com>
(cherry picked from commit eb0fde96097717b412502c06deff42800ab6e570)
| -rw-r--r-- | arch/arm/mach-mx27/mx27ads_gpio.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/mx31ads_gpio.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mxc91321/mxc30030evb_gpio.c | 4 | ||||
| -rw-r--r-- | drivers/mxc/pmic/mc13783/pmic_power.c | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/mach-mx27/mx27ads_gpio.c b/arch/arm/mach-mx27/mx27ads_gpio.c index d1d02007be13..a6aa78290193 100644 --- a/arch/arm/mach-mx27/mx27ads_gpio.c +++ b/arch/arm/mach-mx27/mx27ads_gpio.c @@ -160,10 +160,10 @@ void gpio_uart_inactive(int port, int no_irda) } } -void gpio_on_off_button_active(void) +void gpio_power_key_active(void) { } -EXPORT_SYMBOL(gpio_on_off_button_active); +EXPORT_SYMBOL(gpio_power_key_active); /*! * Configure the IOMUX GPR register to receive shared SDMA UART events diff --git a/arch/arm/mach-mx3/mx31ads_gpio.c b/arch/arm/mach-mx3/mx31ads_gpio.c index ece2853d7027..ed1c3ea8e782 100644 --- a/arch/arm/mach-mx3/mx31ads_gpio.c +++ b/arch/arm/mach-mx3/mx31ads_gpio.c @@ -346,10 +346,10 @@ void gpio_keypad_inactive(void) EXPORT_SYMBOL(gpio_keypad_inactive); -void gpio_on_off_button_active(void) +void gpio_power_key_active(void) { } -EXPORT_SYMBOL(gpio_on_off_button_active); +EXPORT_SYMBOL(gpio_power_key_active); /*! * Setup GPIO for a CSPI device to be active diff --git a/arch/arm/mach-mxc91321/mxc30030evb_gpio.c b/arch/arm/mach-mxc91321/mxc30030evb_gpio.c index 8c7197ec33e3..b7b722659a86 100644 --- a/arch/arm/mach-mxc91321/mxc30030evb_gpio.c +++ b/arch/arm/mach-mxc91321/mxc30030evb_gpio.c @@ -176,10 +176,10 @@ void gpio_uart_inactive(int port, int no_irda) __raw_writew(pbc_bctrl1_clr, PBC_BASE_ADDRESS + PBC_BCTRL1_CLEAR); } -void gpio_on_off_button_active(void) +void gpio_power_key_active(void) { } -EXPORT_SYMBOL(gpio_on_off_button_active); +EXPORT_SYMBOL(gpio_power_key_active); /*! * Configure the IOMUX GPR register to receive shared SDMA UART events diff --git a/drivers/mxc/pmic/mc13783/pmic_power.c b/drivers/mxc/pmic/mc13783/pmic_power.c index d62acad55592..f2f5890ed18a 100644 --- a/drivers/mxc/pmic/mc13783/pmic_power.c +++ b/drivers/mxc/pmic/mc13783/pmic_power.c @@ -3099,8 +3099,6 @@ static int pmic_power_probe(struct platform_device *pdev) pr_info(KERN_ERR "register on-off key interrupt failed\n"); set_irq_wake(irq, 1); - /* gpio1 include on/off interrupt */ - set_irq_wake(MXC_INT_GPIO1, 1); done: pr_info(KERN_INFO "PMIC Power successfully probed\n"); |