]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'amba', 'clk', 'fixes', 'gpio', 'io' (early part), 'p2v' and 'pgt...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 1 Oct 2011 16:55:40 +0000 (17:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 1 Oct 2011 16:55:40 +0000 (17:55 +0100)
1  2  3  4  5  6 
arch/arm/Kconfig
arch/arm/kernel/head.S
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mm/dma-mapping.c
drivers/tty/serial/atmel_serial.c

index 5ebc5d922ea14984e10ef8e10f47d414469efa7c,3146ed3f6eca01a42068454e31f53a3330cc12c6,05589e85c1804d481a6f84e058c9b0e096677d73,2c71a8f3535a1400c2d187e7fa612e00995e6927,272eadc7a12cc552497dd3ad437c0ed76f7438a1,5ebc5d922ea14984e10ef8e10f47d414469efa7c..56006d75b5aa89851cd24bfbc92590687c1d53e1
@@@@@@@ -195,7 -195,7 -195,8 -195,8 -195,8 -195,7 +195,8 @@@@@@@ config VECTORS_BAS
          The base address of exception vectors.
      
      config ARM_PATCH_PHYS_VIRT
--   -  bool "Patch physical to virtual translations at runtime"
  --    bool "Patch physical to virtual translations at runtime (EXPERIMENTAL)"
  --    depends on EXPERIMENTAL
++++ +  bool "Patch physical to virtual translations at runtime" if EMBEDDED
++++ +  default y
        depends on !XIP_KERNEL && MMU
        depends on !ARCH_REALVIEW || !SPARSEMEM
        help
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge