diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 14:58:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 14:58:08 -0700 |
| commit | 1a3f2ea336b784d7df750a7821f514f3dea69e29 (patch) | |
| tree | b7c2f5c7cc841d9f7b38fbdf03219b80dba97ea2 /include/asm-sparc/irq.h | |
| parent | e1d7e7fcf8625857de6b48975096c127e5cb1534 (diff) | |
| parent | 6ba60d2195cd65d72eaf7ce3903a707c5bf20c7b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix O_CLOEXEC values.
[SPARC32]: Fix modular build of floppy driver.
[SOUND] CS4231 SBus: Two fixes.
[CG6]: fix memory size detection
[SPARC64]: Add missing dma_sync_single_range_for_*().
Diffstat (limited to 'include/asm-sparc/irq.h')
| -rw-r--r-- | include/asm-sparc/irq.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/asm-sparc/irq.h b/include/asm-sparc/irq.h index 61fb99643af..fe205cc444b 100644 --- a/include/asm-sparc/irq.h +++ b/include/asm-sparc/irq.h @@ -1,7 +1,6 @@ -/* $Id: irq.h,v 1.32 2000/08/26 02:42:28 anton Exp $ - * irq.h: IRQ registers on the Sparc. +/* irq.h: IRQ registers on the Sparc. * - * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) + * Copyright (C) 1995, 2007 David S. Miller (davem@davemloft.net) */ #ifndef _SPARC_IRQ_H @@ -13,6 +12,4 @@ #define irq_canonicalize(irq) (irq) -extern int request_fast_irq(unsigned int irq, irq_handler_t handler, unsigned long flags, __const__ char *devname); - #endif |