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/plat-s3c24xx/irq.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/plat-s3c24xx/irq.c')
-rw-r--r-- | arch/arm/plat-s3c24xx/irq.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c index ae2c5d7efc9d..001436c04b13 100644 --- a/arch/arm/plat-s3c24xx/irq.c +++ b/arch/arm/plat-s3c24xx/irq.c | |||
@@ -292,27 +292,27 @@ s3c_irqext_type(unsigned int irq, unsigned int type) | |||
292 | /* Set the external interrupt to pointed trigger type */ | 292 | /* Set the external interrupt to pointed trigger type */ |
293 | switch (type) | 293 | switch (type) |
294 | { | 294 | { |
295 | case IRQT_NOEDGE: | 295 | case IRQ_TYPE_NONE: |
296 | printk(KERN_WARNING "No edge setting!\n"); | 296 | printk(KERN_WARNING "No edge setting!\n"); |
297 | break; | 297 | break; |
298 | 298 | ||
299 | case IRQT_RISING: | 299 | case IRQ_TYPE_EDGE_RISING: |
300 | newvalue = S3C2410_EXTINT_RISEEDGE; | 300 | newvalue = S3C2410_EXTINT_RISEEDGE; |
301 | break; | 301 | break; |
302 | 302 | ||
303 | case IRQT_FALLING: | 303 | case IRQ_TYPE_EDGE_FALLING: |
304 | newvalue = S3C2410_EXTINT_FALLEDGE; | 304 | newvalue = S3C2410_EXTINT_FALLEDGE; |
305 | break; | 305 | break; |
306 | 306 | ||
307 | case IRQT_BOTHEDGE: | 307 | case IRQ_TYPE_EDGE_BOTH: |
308 | newvalue = S3C2410_EXTINT_BOTHEDGE; | 308 | newvalue = S3C2410_EXTINT_BOTHEDGE; |
309 | break; | 309 | break; |
310 | 310 | ||
311 | case IRQT_LOW: | 311 | case IRQ_TYPE_LEVEL_LOW: |
312 | newvalue = S3C2410_EXTINT_LOWLEV; | 312 | newvalue = S3C2410_EXTINT_LOWLEV; |
313 | break; | 313 | break; |
314 | 314 | ||
315 | case IRQT_HIGH: | 315 | case IRQ_TYPE_LEVEL_HIGH: |
316 | newvalue = S3C2410_EXTINT_HILEV; | 316 | newvalue = S3C2410_EXTINT_HILEV; |
317 | break; | 317 | break; |
318 | 318 | ||