aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/platform_data
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/platform_data')
-rw-r--r--include/linux/platform_data/gpio-omap.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/platform_data/gpio-omap.h b/include/linux/platform_data/gpio-omap.h
index 8612855691b2..ed071f76b642 100644
--- a/include/linux/platform_data/gpio-omap.h
+++ b/include/linux/platform_data/gpio-omap.h
@@ -24,8 +24,10 @@
24#ifndef __ASM_ARCH_OMAP_GPIO_H 24#ifndef __ASM_ARCH_OMAP_GPIO_H
25#define __ASM_ARCH_OMAP_GPIO_H 25#define __ASM_ARCH_OMAP_GPIO_H
26 26
27#ifndef __ASSEMBLER__
27#include <linux/io.h> 28#include <linux/io.h>
28#include <linux/platform_device.h> 29#include <linux/platform_device.h>
30#endif
29 31
30#define OMAP1_MPUIO_BASE 0xfffb5000 32#define OMAP1_MPUIO_BASE 0xfffb5000
31 33
@@ -157,6 +159,7 @@
157#define OMAP_MPUIO(nr) (OMAP_MAX_GPIO_LINES + (nr)) 159#define OMAP_MPUIO(nr) (OMAP_MAX_GPIO_LINES + (nr))
158#define OMAP_GPIO_IS_MPUIO(nr) ((nr) >= OMAP_MAX_GPIO_LINES) 160#define OMAP_GPIO_IS_MPUIO(nr) ((nr) >= OMAP_MAX_GPIO_LINES)
159 161
162#ifndef __ASSEMBLER__
160struct omap_gpio_reg_offs { 163struct omap_gpio_reg_offs {
161 u16 revision; 164 u16 revision;
162 u16 direction; 165 u16 direction;
@@ -215,5 +218,6 @@ static inline void omap2_gpio_resume_after_idle(void)
215{ 218{
216} 219}
217#endif 220#endif
221#endif /* __ASSEMBLER__ */
218 222
219#endif 223#endif