diff options
Diffstat (limited to 'include/asm-arm/arch-pxa/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/hardware.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h index a76a0290a..3ff1d2614 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h @@ -84,10 +84,10 @@ typedef struct { volatile u32 offset[4096]; } __regbase; # define __REG(x) io_p2v(x) # define __PREG(x) io_v2p(x) -# undef io_p2v +# undef io_p2v # undef __REG # ifndef __ASSEMBLY__ -# define io_p2v(PhAdd) (PhAdd) +# define io_p2v(PhAdd) (PhAdd) # define __REG(x) (*((volatile u32 *)io_p2v(x))) # define __REG2(x,y) (*(volatile u32 *)((u32)&__REG(x) + (y))) # else @@ -105,9 +105,9 @@ typedef struct { volatile u32 offset[4096]; } __regbase; * This must be called *before* the corresponding IRQ is registered. * Use this instead of directly setting GRER/GFER. */ -#define GPIO_FALLING_EDGE 1 -#define GPIO_RISING_EDGE 2 -#define GPIO_BOTH_EDGES 3 +#define GPIO_FALLING_EDGE 1 +#define GPIO_RISING_EDGE 2 +#define GPIO_BOTH_EDGES 3 extern void set_GPIO_IRQ_edge( int gpio_nr, int edge_mask ); /* @@ -147,4 +147,8 @@ extern unsigned int get_lclk_frequency_10khz(void); #include "innokom.h" #endif -#endif /* _ASM_ARCH_HARDWARE_H */ +#ifdef CONFIG_ARCH_PLEB +#include "pleb.h" +#endif + +#endif /* _ASM_ARCH_HARDWARE_H */ |