diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-15 08:37:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-15 08:37:09 -0800 |
| commit | 8cc91677ae027e15654d7d86a735a7ab6f5c2ec1 (patch) | |
| tree | 68298494c949f14e4cc67b64a43579e7297112ca /arch/avr32/mach-at32ap/intc.c | |
| parent | d32ddd8f20e7d7a49c45c337c2079be03c77dc41 (diff) | |
| parent | 597702aeb492fcb8e1b48283e1450df40e928ba0 (diff) | |
| download | kernel-crypto-8cc91677ae027e15654d7d86a735a7ab6f5c2ec1.tar.gz kernel-crypto-8cc91677ae027e15654d7d86a735a7ab6f5c2ec1.tar.xz kernel-crypto-8cc91677ae027e15654d7d86a735a7ab6f5c2ec1.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
[AVR32] Export intc_get_pending symbol
[AVR32] Add missing bit in PCCR sysreg
[AVR32] Fix duplicate clock index in at32ap machine code
[AVR32] remove UID16 option
[AVR32] Turn off debugging in SMC driver
Extend I/O resource for wdt0 for at32ap7000 devices
[AVR32] pcmcia ioaddr_t should be 32 bits on AVR32
Diffstat (limited to 'arch/avr32/mach-at32ap/intc.c')
| -rw-r--r-- | arch/avr32/mach-at32ap/intc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/avr32/mach-at32ap/intc.c b/arch/avr32/mach-at32ap/intc.c index dd5c009cf22..0b286cd5302 100644 --- a/arch/avr32/mach-at32ap/intc.c +++ b/arch/avr32/mach-at32ap/intc.c @@ -13,6 +13,7 @@ #include <linux/irq.h> #include <linux/platform_device.h> +#include <asm/intc.h> #include <asm/io.h> #include "intc.h" @@ -136,7 +137,8 @@ fail: panic("Interrupt controller initialization failed!\n"); } -unsigned long intc_get_pending(int group) +unsigned long intc_get_pending(unsigned int group) { return intc_readl(&intc0, INTREQ0 + 4 * group); } +EXPORT_SYMBOL_GPL(intc_get_pending); |