Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6e98a2f88e65d57cff9c98ce1744ff8e4498de31
Commit:     6e98a2f88e65d57cff9c98ce1744ff8e4498de31
Parent:     7ef416c4b878685a419a3b2f133ab5e7283f96b0
Author:     Michael-Luke Jones <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 16 23:01:58 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Tue Feb 6 16:46:46 2007 +0000

    [ARM] 4031/1: Remove references to the Avila in ixdp425 setup code
    
    This patch removes references to the Gateworks Avila Network
    Platform in the ixdp425 setup code. Avila setup should occur
    separately now that a CF ATA device driver is available.
    
    Signed-off-by: Michael-Luke Jones <[EMAIL PROTECTED]>
    Signed-off-by: Deepak Saxena <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-ixp4xx/ixdp425-pci.c   |    2 +-
 arch/arm/mach-ixp4xx/ixdp425-setup.c |   20 --------------------
 2 files changed, 1 insertions(+), 21 deletions(-)

diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c 
b/arch/arm/mach-ixp4xx/ixdp425-pci.c
index d5156c0..99c1dc8 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = {
 int __init ixdp425_pci_init(void)
 {
        if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
-                       machine_is_avila() || machine_is_ixdp465())
+                       machine_is_ixdp465())
                pci_common_init(&ixdp425_pci);
        return 0;
 }
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c 
b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index da72383..04b1d56 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -156,23 +156,3 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development 
Platform")
        .init_machine   = ixdp425_init,
 MACHINE_END
 #endif
-
-/*
- * Avila is functionally equivalent to IXDP425 except that it adds
- * a CF IDE slot hanging off the expansion bus. When we have a 
- * driver for IXP4xx CF IDE with driver model support we'll move
- * Avila to it's own setup file.
- */
-#ifdef CONFIG_ARCH_AVILA
-MACHINE_START(AVILA, "Gateworks Avila Network Platform")
-       /* Maintainer: Deepak Saxena <[EMAIL PROTECTED]> */
-       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-       .map_io         = ixp4xx_map_io,
-       .init_irq       = ixp4xx_init_irq,
-       .timer          = &ixp4xx_timer,
-       .boot_params    = 0x0100,
-       .init_machine   = ixdp425_init,
-MACHINE_END
-#endif
-
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to