diff options
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach')
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/gpio.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/mcp.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/gpio.h b/arch/arm/mach-sa1100/include/mach/gpio.h index 703631887c94..a38fc4f54241 100644 --- a/arch/arm/mach-sa1100/include/mach/gpio.h +++ b/arch/arm/mach-sa1100/include/mach/gpio.h | |||
@@ -51,7 +51,4 @@ static inline void gpio_set_value(unsigned gpio, int value) | |||
51 | 51 | ||
52 | #define gpio_cansleep __gpio_cansleep | 52 | #define gpio_cansleep __gpio_cansleep |
53 | 53 | ||
54 | #define gpio_to_irq(gpio) ((gpio < 11) ? (IRQ_GPIO0 + gpio) : \ | ||
55 | (IRQ_GPIO11 - 11 + gpio)) | ||
56 | |||
57 | #endif | 54 | #endif |
diff --git a/arch/arm/mach-sa1100/include/mach/mcp.h b/arch/arm/mach-sa1100/include/mach/mcp.h index ed1a331508a7..586cec898b35 100644 --- a/arch/arm/mach-sa1100/include/mach/mcp.h +++ b/arch/arm/mach-sa1100/include/mach/mcp.h | |||
@@ -17,6 +17,8 @@ struct mcp_plat_data { | |||
17 | u32 mccr1; | 17 | u32 mccr1; |
18 | unsigned int sclk_rate; | 18 | unsigned int sclk_rate; |
19 | int gpio_base; | 19 | int gpio_base; |
20 | const char *codec; | ||
21 | void *codec_pdata; | ||
20 | }; | 22 | }; |
21 | 23 | ||
22 | #endif | 24 | #endif |