Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into devel

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-realview/Kconfig
Simple merge

diff --cc arch/arm/mach-realview/core.c
index 2491374818e978322aedb16cecba419183e49f25,86aa6d74126fe968778f905635111e18aae96f89..5f1d55963cedb8e7b4d3cbd0b6e71a24c84b10c9
--- 1/arch/arm/mach-realview/core.c
--- 2/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@@ -28,8 -28,8 +28,9 @@@
  #include <linux/clocksource.h>
  #include <linux/clockchips.h>
  #include <linux/io.h>
+ #include <linux/smc911x.h>
  
 +#include <asm/clkdev.h>
  #include <asm/system.h>
  #include <mach/hardware.h>
  #include <asm/irq.h>

diff --cc arch/arm/mach-realview/core.h
Simple merge

diff --cc arch/arm/mach-realview/include/mach/memory.h
index 65a0742094f7ca93518137e1e7f59490c6b00d59,759ed10d74fe80422eb338c7ae3779cf5bd34567..293c30025e7e0eb42438cf5fb20be26082e7cd2b
--- 1/arch/arm/mach-realview/include/mach/memory.h
--- 2/arch/arm/mach-realview/include/mach/memory.h
+++ b/arch/arm/mach-realview/include/mach/memory.h
@@@ -23,6 -23,20 +23,10 @@@
  /*
   * Physical DRAM offset.
   */
+ #ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
+ #define PHYS_OFFSET           UL(0x70000000)
+ #else
  #define PHYS_OFFSET           UL(0x00000000)
+ #endif
  
 -/*
 - * Virtual view <-> DMA view memory address translations
 - * virt_to_bus: Used to translate the virtual address to an
 - *              address suitable to be passed to set_dma_addr
 - * bus_to_virt: Used to convert an address for DMA operations
 - *              to an address that the kernel can use.
 - */
 -#define __virt_to_bus(x)      ((x) - PAGE_OFFSET)
 -#define __bus_to_virt(x)      ((x) + PAGE_OFFSET)
 -
  #endif

diff --cc arch/arm/mach-realview/realview_eb.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pb1176.c
index 0481416d37c947238a370f8a1328393d2f005384,0388ed06f1e5eb53a77fa2e631a3ea0133d3ed12..8f0683c22140fdced876f5e72c696151faec4ca4
--- 1/arch/arm/mach-realview/realview_pb1176.c
--- 2/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@@ -265,8 -258,10 +258,8 @@@ static void __init realview_pb1176_init
        l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000, 0xfe000fff);
  #endif
  
 -      clk_register(&realview_clcd_clk);
 -
        realview_flash_register(&realview_pb1176_flash_resource, 1);
-       platform_device_register(&realview_pb1176_smsc911x_device);
+       realview_eth_register(NULL, realview_pb1176_smsc911x_resources);
  
        for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                struct amba_device *d = amba_devs[i];

diff --cc arch/arm/mach-realview/realview_pb11mp.c
index 6197dd8e8edf8a509d0ec021b6483e2af1cef7ff,3f3f052138f169afafbdbfc9cfdb1d02e6f8d1e4..3ebdb2dadd6f02c2430fc657a8fc9e51b81d85cb
--- 1/arch/arm/mach-realview/realview_pb11mp.c
--- 2/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@@ -312,9 -304,11 +304,9 @@@ static void __init realview_pb11mp_init
        l2x0_init(__io_address(REALVIEW_TC11MP_L220_BASE), 0x00790000, 0xfe000fff);
  #endif
  
 -      clk_register(&realview_clcd_clk);
 -
        realview_flash_register(realview_pb11mp_flash_resource,
                                ARRAY_SIZE(realview_pb11mp_flash_resource));
-       platform_device_register(&realview_pb11mp_smsc911x_device);
+       realview_eth_register(NULL, realview_pb11mp_smsc911x_resources);
        platform_device_register(&realview_i2c_device);
        platform_device_register(&realview_pb11mp_cf_device);
  

diff --cc arch/arm/mm/Kconfig
Simple merge