diff options
| author | Jiri Kosina | 2011-11-13 20:55:35 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2011-11-13 20:55:53 +0100 |
| commit | 2290c0d06d82faee87b1ab2d9d4f7bf81ef64379 (patch) | |
| tree | e075e4d5534193f28e6059904f61e5ca03958d3c /arch/m68k/include/asm/q40ints.h | |
| parent | crypto: drop selects of bogus Kconfig symbol (diff) | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| download | kernel-qcow2-linux-2290c0d06d82faee87b1ab2d9d4f7bf81ef64379.tar.gz kernel-qcow2-linux-2290c0d06d82faee87b1ab2d9d4f7bf81ef64379.tar.xz kernel-qcow2-linux-2290c0d06d82faee87b1ab2d9d4f7bf81ef64379.zip | |
Merge branch 'master' into for-next
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
Diffstat (limited to 'arch/m68k/include/asm/q40ints.h')
| -rw-r--r-- | arch/m68k/include/asm/q40ints.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/q40ints.h b/arch/m68k/include/asm/q40ints.h index 3d970afb708f..22f12c9eb910 100644 --- a/arch/m68k/include/asm/q40ints.h +++ b/arch/m68k/include/asm/q40ints.h @@ -24,6 +24,3 @@ #define Q40_IRQ10_MASK (1<<5) #define Q40_IRQ14_MASK (1<<6) #define Q40_IRQ15_MASK (1<<7) - -extern unsigned long q40_probe_irq_on (void); -extern int q40_probe_irq_off (unsigned long irqs); |