diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
| commit | 809b4e00baf006a990a73329ba381d536c6fa277 (patch) | |
| tree | e949e0efd019d6f932537aba762792b07a84351c /arch/arm/mach-pxa/include/mach/zeus.h | |
| parent | a0a55682b83fd5f012afadcf415b030d7424ae68 (diff) | |
| parent | 79a94c3538bda6869d7bb150b5e02dd3a72314dd (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/zeus.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/zeus.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/zeus.h b/arch/arm/mach-pxa/include/mach/zeus.h index 6e119976003e..faa408ab7ad7 100644 --- a/arch/arm/mach-pxa/include/mach/zeus.h +++ b/arch/arm/mach-pxa/include/mach/zeus.h | |||
| @@ -15,6 +15,8 @@ | |||
| 15 | #ifndef _MACH_ZEUS_H | 15 | #ifndef _MACH_ZEUS_H |
| 16 | #define _MACH_ZEUS_H | 16 | #define _MACH_ZEUS_H |
| 17 | 17 | ||
| 18 | #define ZEUS_NR_IRQS (IRQ_BOARD_START + 48) | ||
| 19 | |||
| 18 | /* Physical addresses */ | 20 | /* Physical addresses */ |
| 19 | #define ZEUS_FLASH_PHYS PXA_CS0_PHYS | 21 | #define ZEUS_FLASH_PHYS PXA_CS0_PHYS |
| 20 | #define ZEUS_ETH0_PHYS PXA_CS1_PHYS | 22 | #define ZEUS_ETH0_PHYS PXA_CS1_PHYS |