diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /arch/arm/mach-sa1100/include/mach/cerf.h | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach/cerf.h')
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/cerf.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/cerf.h b/arch/arm/mach-sa1100/include/mach/cerf.h index c3ac3d0f9465..88fd9c006ce0 100644 --- a/arch/arm/mach-sa1100/include/mach/cerf.h +++ b/arch/arm/mach-sa1100/include/mach/cerf.h | |||
| @@ -14,15 +14,10 @@ | |||
| 14 | #define CERF_ETH_IO 0xf0000000 | 14 | #define CERF_ETH_IO 0xf0000000 |
| 15 | #define CERF_ETH_IRQ IRQ_GPIO26 | 15 | #define CERF_ETH_IRQ IRQ_GPIO26 |
| 16 | 16 | ||
| 17 | #define CERF_GPIO_CF_BVD2 GPIO_GPIO (19) | 17 | #define CERF_GPIO_CF_BVD2 19 |
| 18 | #define CERF_GPIO_CF_BVD1 GPIO_GPIO (20) | 18 | #define CERF_GPIO_CF_BVD1 20 |
| 19 | #define CERF_GPIO_CF_RESET GPIO_GPIO (21) | 19 | #define CERF_GPIO_CF_RESET 21 |
| 20 | #define CERF_GPIO_CF_IRQ GPIO_GPIO (22) | 20 | #define CERF_GPIO_CF_IRQ 22 |
| 21 | #define CERF_GPIO_CF_CD GPIO_GPIO (23) | 21 | #define CERF_GPIO_CF_CD 23 |
| 22 | |||
| 23 | #define CERF_IRQ_GPIO_CF_BVD2 IRQ_GPIO19 | ||
| 24 | #define CERF_IRQ_GPIO_CF_BVD1 IRQ_GPIO20 | ||
| 25 | #define CERF_IRQ_GPIO_CF_IRQ IRQ_GPIO22 | ||
| 26 | #define CERF_IRQ_GPIO_CF_CD IRQ_GPIO23 | ||
| 27 | 22 | ||
| 28 | #endif // _INCLUDE_CERF_H_ | 23 | #endif // _INCLUDE_CERF_H_ |