+++ /dev/null
---- a/arch/arm/mach-ixp4xx/include/mach/hardware.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/hardware.h
-@@ -18,7 +18,7 @@
- #define __ASM_ARCH_HARDWARE_H__
-
- #define PCIBIOS_MIN_IO 0x00001000
--#define PCIBIOS_MIN_MEM (cpu_is_ixp43x() ? 0x40000000 : 0x48000000)
-+#define PCIBIOS_MIN_MEM 0x48000000
-
- /*
- * We override the standard dma-mask routines for bouncing.
+++ /dev/null
---- a/arch/arm/mach-ixp4xx/include/mach/avila.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/avila.h
-@@ -25,7 +25,7 @@
- /*
- * AVILA PCI IRQs
- */
--#define AVILA_PCI_MAX_DEV 4
-+#define AVILA_PCI_MAX_DEV 6
- #define LOFT_PCI_MAX_DEV 6
- #define AVILA_PCI_IRQ_LINES 4
-
+++ /dev/null
---- a/arch/arm/mach-ixp4xx/common.c
-+++ b/arch/arm/mach-ixp4xx/common.c
-@@ -427,6 +427,17 @@ static void __init ixp4xx_clocksource_in
- }
-
- /*
-+ * sched_clock()
-+ */
-+unsigned long long sched_clock(void)
-+{
-+ cycle_t cyc = ixp4xx_get_cycles(NULL);
-+ struct clocksource *cs = &clocksource_ixp4xx;
-+
-+ return clocksource_cyc2ns(cyc, cs->mult, cs->shift);
-+}
-+
-+/*
- * clockevents
- */
- static int ixp4xx_set_next_event(unsigned long evt,
+++ /dev/null
---- a/arch/arm/mm/fault-armv.c
-+++ b/arch/arm/mm/fault-armv.c
-@@ -127,8 +127,6 @@ make_coherent(struct address_space *mapp
- flush_dcache_mmap_unlock(mapping);
- if (aliases)
- adjust_pte(vma, addr);
-- else
-- flush_cache_page(vma, addr, pfn);
- }
-
- /*