diff options
| author |  Russell King <rmk@dyn-67.arm.linux.org.uk>
| 2009-04-15 09:58:21 +0100 |
|---|---|---|
| committer |  Russell King <rmk+kernel@arm.linux.org.uk>
| 2009-04-15 09:58:21 +0100 |
| commit | 9fa264d0d327a67db4913b400bcfb174d929054c (patch) | |
| tree | ec2ba2b7d6d9c32e7bdb2d2aa8c61bfe48546664 /arch/arm/mach-pxa/generic.h | |
| parent | Linux 2.6.30-rc2 (diff) | |
| parent | [ARM] pxa/em-x270: remove duplicated #include (diff) | |
| download | linux-9fa264d0d327a67db4913b400bcfb174d929054c.tar.gz linux-9fa264d0d327a67db4913b400bcfb174d929054c.tar.bz2 linux-9fa264d0d327a67db4913b400bcfb174d929054c.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/generic.h')
| -rw-r--r-- | arch/arm/mach-pxa/generic.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h index 3465268ca716..485fede83d97 100644 --- a/arch/arm/mach-pxa/generic.h +++ b/arch/arm/mach-pxa/generic.h @@ -15,6 +15,9 @@ extern struct sys_timer pxa_timer; extern void __init pxa_init_irq(int irq_nr, int (*set_wake)(unsigned int, unsigned int)); extern void __init pxa25x_init_irq(void); +#ifdef CONFIG_CPU_PXA26x +extern void __init pxa26x_init_irq(void); +#endif extern void __init pxa27x_init_irq(void); extern void __init pxa3xx_init_irq(void); extern void __init pxa_map_io(void); |