diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-26 06:10:40 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-26 06:10:40 -0400 |
| commit | b7a5b7acb796e5c950a58a35aee559b284de6e59 (patch) | |
| tree | 2873f14dadaa136598977c24a90246b00143b479 /arch/arm/mach-s5pc100/include/mach/irqs.h | |
| parent | f7b4dc7a14b84d5f2ae236a1a2bb211673717c5d (diff) | |
| parent | 459f2a32024b46b7f144999738112eb88654eb0f (diff) | |
ARM: Merge next-samsung
Merge branch 'next-samsung' into for-linus/2634-git-updates
Diffstat (limited to 'arch/arm/mach-s5pc100/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-s5pc100/include/mach/irqs.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/irqs.h b/arch/arm/mach-s5pc100/include/mach/irqs.h index 15066df3ced9..28aa551dc3a8 100644 --- a/arch/arm/mach-s5pc100/include/mach/irqs.h +++ b/arch/arm/mach-s5pc100/include/mach/irqs.h | |||
| @@ -100,9 +100,6 @@ | |||
| 100 | #define S5P_EINT_BASE1 (S5P_IRQ_VIC0(0)) | 100 | #define S5P_EINT_BASE1 (S5P_IRQ_VIC0(0)) |
| 101 | #define S5P_EINT_BASE2 (IRQ_VIC_END + 1) | 101 | #define S5P_EINT_BASE2 (IRQ_VIC_END + 1) |
| 102 | 102 | ||
| 103 | #define IRQ_EINT(x) ((x) < 16 ? S5P_IRQ_VIC0(x) : \ | ||
| 104 | (S5P_EINT_BASE2 + (x) - 16)) | ||
| 105 | |||
| 106 | #define S3C_IRQ_GPIO_BASE (IRQ_EINT(31) + 1) | 103 | #define S3C_IRQ_GPIO_BASE (IRQ_EINT(31) + 1) |
| 107 | #define S3C_IRQ_GPIO(x) (S3C_IRQ_GPIO_BASE + (x)) | 104 | #define S3C_IRQ_GPIO(x) (S3C_IRQ_GPIO_BASE + (x)) |
| 108 | 105 | ||