diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-23 18:06:37 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-23 18:06:37 +0000 |
commit | 40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb (patch) | |
tree | 0d949c487ba15c4c8198a69cd7b8c0cdb5773af4 /arch/arm/mach-pxa/include/mach/littleton.h | |
parent | d83a12a40915774332cec625856c2e7ba9033e15 (diff) | |
parent | 3b24f30c4f678cfab5c6d090af9559fefa37cc41 (diff) |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/am200epd.c
arch/arm/mach-pxa/ezx.c
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/littleton.h')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/littleton.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/littleton.h b/arch/arm/mach-pxa/include/mach/littleton.h index 5c4e320c143..6c9b21c5132 100644 --- a/arch/arm/mach-pxa/include/mach/littleton.h +++ b/arch/arm/mach-pxa/include/mach/littleton.h @@ -1,8 +1,13 @@ -#ifndef __ASM_ARCH_ZYLONITE_H -#define __ASM_ARCH_ZYLONITE_H +#ifndef __ASM_ARCH_LITTLETON_H +#define __ASM_ARCH_LITTLETON_H + +#include <mach/gpio.h> #define LITTLETON_ETH_PHYS 0x30000000 #define LITTLETON_GPIO_LCD_CS (17) -#endif /* __ASM_ARCH_ZYLONITE_H */ +#define EXT0_GPIO_BASE (NR_BUILTIN_GPIO) +#define EXT0_GPIO(x) (EXT0_GPIO_BASE + (x)) + +#endif /* __ASM_ARCH_LITTLETON_H */ |