diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gpio.h | 7 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h index 3b52b86498a..7232f8ca474 100644 --- a/arch/arm/mach-s3c2410/include/mach/gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio.h @@ -15,4 +15,11 @@ #define gpio_set_value __gpio_set_value #define gpio_cansleep __gpio_cansleep +/* These two defines should be removed as soon as the + * generic irq handling makes it upstream */ +#include <mach/hardware.h> +#define gpio_to_irq(gpio) s3c2410_gpio_getirq(gpio) +#define irq_to_gpio(irq) s3c2410_gpio_irq2pin(irq) +/* -- cut to here when generic irq makes it */ + #include <asm-generic/gpio.h> diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c index b720db4e88f..ad0d9c8997d 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c @@ -19,7 +19,7 @@ #include <linux/errno.h> #include <linux/interrupt.h> -#include <asm/arch/gpio.h> +#include <mach/gpio.h> #include <asm/mach-types.h> #include <mach/gta01.h> #include <asm/plat-s3c24xx/neo1973.h> |