diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-14 14:57:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-14 14:57:05 -0500 |
| commit | c25ecd0a21d5e08160cb5cc984f9e2b8ee347443 (patch) | |
| tree | 0e4dcacf1bf603f259b8d27445a10e60fa8d00d7 /arch/arm/mach-pxa/cm-x2xx.c | |
| parent | 190683a9d5457e6d962c232ffbecac3ab158dddd (diff) | |
| parent | 9457b24a0955bbdd2e89220a75de69fe09501bba (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/arm/mach-pxa/cm-x2xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x2xx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c index ac5598ce9724..d34b99febeb9 100644 --- a/arch/arm/mach-pxa/cm-x2xx.c +++ b/arch/arm/mach-pxa/cm-x2xx.c | |||
| @@ -476,8 +476,6 @@ static void __init cmx2xx_init(void) | |||
| 476 | 476 | ||
| 477 | static void __init cmx2xx_init_irq(void) | 477 | static void __init cmx2xx_init_irq(void) |
| 478 | { | 478 | { |
| 479 | pxa27x_init_irq(); | ||
| 480 | |||
| 481 | if (cpu_is_pxa25x()) { | 479 | if (cpu_is_pxa25x()) { |
| 482 | pxa25x_init_irq(); | 480 | pxa25x_init_irq(); |
| 483 | cmx2xx_pci_init_irq(CMX255_GPIO_IT8152_IRQ); | 481 | cmx2xx_pci_init_irq(CMX255_GPIO_IT8152_IRQ); |