1 diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c
2 --- linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-04-15 14:26:04.000000000 +0200
3 +++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-05-10 11:10:40.000000000 +0200
5 int __init ixdp425_pci_init(void)
7 if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
8 - machine_is_avila() || machine_is_ixdp465() || machine_is_compex())
9 + machine_is_ixdp465() || machine_is_compex())
10 pci_common_init(&ixdp425_pci);
13 diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-setup.c
14 --- linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-04-15 14:26:49.000000000 +0200
15 +++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-05-10 11:10:01.000000000 +0200
17 .init_machine = ixdp425_init,
22 - * Avila is functionally equivalent to IXDP425 except that it adds
23 - * a CF IDE slot hanging off the expansion bus. When we have a
24 - * driver for IXP4xx CF IDE with driver model support we'll move
25 - * Avila to it's own setup file.
27 -#ifdef CONFIG_ARCH_AVILA
28 -MACHINE_START(AVILA, "Gateworks Avila Network Platform")
29 - /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
30 - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
31 - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
32 - .map_io = ixp4xx_map_io,
33 - .init_irq = ixp4xx_init_irq,
34 - .timer = &ixp4xx_timer,
35 - .boot_params = 0x0100,
36 - .init_machine = ixdp425_init,