diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 19:46:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 19:46:08 -0400 |
| commit | 3e318b5b55fafebd3a6e4dd3a00b79bfc0668675 (patch) | |
| tree | e2be576d5ab3487d0c350b421bff7e285fd056c2 /arch/arm/mach-sa1100/cerf.c | |
| parent | 940389b8afad6495211614c13eb91ef7001773ec (diff) | |
| parent | 53cdb27a933e4032934cbda0b447cfc9943c0eac (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix shared mmap when more than two maps of the same file exist
[ARM] fix VIPT/VIVT macro optimisations, add comments
[ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_*
[ARM] update defconfig for eseries.
[ARM] PXA: squash warning in pxafb
[ARM] pxa: PXA25x UDC - Fix warning during build
[ARM] fix nwflash.c: 6ee8928d94841aa764aeaf645ad16daff811dc26
[ARM] fix IOP32x, IOP33x, MXC and Samsung builds
[ARM] pci: provide dummy pci_get_legacy_ide_irq()
[ARM] fix fls() for 64-bit arguments
[ARM] fix mode for board-yl-9200.c
[ARM] 5176/1: arm/Makefile: fix: ARM946T -> ARM946E
Diffstat (limited to 'arch/arm/mach-sa1100/cerf.c')
| -rw-r--r-- | arch/arm/mach-sa1100/cerf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c index 31afe50d7cd5..56d3ee01baae 100644 --- a/arch/arm/mach-sa1100/cerf.c +++ b/arch/arm/mach-sa1100/cerf.c | |||
| @@ -96,7 +96,7 @@ static struct resource cerf_flash_resource = { | |||
| 96 | static void __init cerf_init_irq(void) | 96 | static void __init cerf_init_irq(void) |
| 97 | { | 97 | { |
| 98 | sa1100_init_irq(); | 98 | sa1100_init_irq(); |
| 99 | set_irq_type(CERF_ETH_IRQ, IRQT_RISING); | 99 | set_irq_type(CERF_ETH_IRQ, IRQ_TYPE_EDGE_RISING); |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | static struct map_desc cerf_io_desc[] __initdata = { | 102 | static struct map_desc cerf_io_desc[] __initdata = { |