diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
| commit | 044e5f45e4ad890d03bd1e8bb44c634397cac24d (patch) | |
| tree | a6063f77bd719d933823915d2273eaadb6331611 /arch/sh | |
| parent | f0006314d37639714da9658cf4ff3f1f9f420764 (diff) | |
| parent | faf64ed4968e354624f330c6da6c1ce8b05a0713 (diff) | |
Merge branch 'pxa' into devel
Conflicts:
arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/boards/renesas/migor/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/boards/renesas/migor/setup.c b/arch/sh/boards/renesas/migor/setup.c index 01af44245b57..963c99322095 100644 --- a/arch/sh/boards/renesas/migor/setup.c +++ b/arch/sh/boards/renesas/migor/setup.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | 30 | ||
| 31 | static struct smc91x_platdata smc91x_info = { | 31 | static struct smc91x_platdata smc91x_info = { |
| 32 | .flags = SMC91X_USE_16BIT, | 32 | .flags = SMC91X_USE_16BIT, |
| 33 | .irq_flags = IRQF_TRIGGER_HIGH, | ||
| 34 | }; | 33 | }; |
| 35 | 34 | ||
| 36 | static struct resource smc91x_eth_resources[] = { | 35 | static struct resource smc91x_eth_resources[] = { |
| @@ -42,7 +41,7 @@ static struct resource smc91x_eth_resources[] = { | |||
| 42 | }, | 41 | }, |
| 43 | [1] = { | 42 | [1] = { |
| 44 | .start = 32, /* IRQ0 */ | 43 | .start = 32, /* IRQ0 */ |
| 45 | .flags = IORESOURCE_IRQ, | 44 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
| 46 | }, | 45 | }, |
| 47 | }; | 46 | }; |
| 48 | 47 | ||