Commit fdc76bf9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] clps711x: add sparsemem definitions
  [ARM] 5315/1: Fix section mismatch warning (sa1111)
  [ARM] Orion: activate workaround for 88f6183 SPI clock erratum
  [ARM] Orion: instantiate the dsa switch driver
  [ARM] mv78xx0: force link speed/duplex on eth2/eth3
  [ARM] remove extra brace in arch/arm/mach-pxa/trizeps4.c
  [ARM] balance parenthesis in header file
  [ARM] pxa: fix trizeps PCMCIA build
  [ARM] pxa: fix trizeps defconfig
  [ARM] dmabounce requires ZONE_DMA
  [ARM] 5303/1: period_cycles should be greater than 1
  [ARM] 5310/1: Fix cache flush functions for ARMv4
  [ARM] pxa: fix 3bca103a
  [ARM] pxa: fix redefinition of NR_IRQS
  [ARM] S3C24XX: Fix redefine of DEFINE_TIMER() in s3c24xx pwm-clock.c
  [ARM] S3C2443: Fix HCLK rate
  [ARM] S3C24XX: Serial driver debug depends on DEBUG_LL
  [ARM] S3C24XX: pwm-clock set_parent mask fix
parents 72441bdc f6335c43

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ config ARCH_IXP4XX 
	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ZONE_DMA if PCI

	select DMABOUNCE if PCI

	help

	  Support for Intel's IXP4XX (XScale) family of processors.

arch/arm/common/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ config ICST307 
config SA1111

	bool

	select DMABOUNCE if !ARCH_PXA

	select ZONE_DMA if !ARCH_PXA



config DMABOUNCE

	bool

	select ZONE_DMA



config TIMER_ACORN

	bool

arch/arm/common/sa1111.c

+3 −1
Original line number Diff line number Diff line
@@ -581,6 +581,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, 
		goto out;

	}



#ifdef CONFIG_DMABOUNCE

	/*

	 * If the parent device has a DMA mask associated with it,

	 * propagate it down to the children.
@@ -598,6 +599,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, 
			}

		}

	}

#endif



out:

	return ret;
@@ -937,7 +939,7 @@ static int sa1111_resume(struct platform_device *dev) 
#define sa1111_resume  NULL

#endif



static int sa1111_probe(struct platform_device *pdev)

static int __devinit sa1111_probe(struct platform_device *pdev)

{

	struct resource *mem;

	int irq;

arch/arm/configs/trizeps4_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ CONFIG_ARCH_PXA=y 
# CONFIG_MACH_MAINSTONE is not set

# CONFIG_ARCH_PXA_IDP is not set

# CONFIG_PXA_SHARPSL is not set

CONFIG_TRIZEPS_PXA=y

CONFIG_MACH_TRIZEPS4=y

CONFIG_MACH_TRIZEPS4_CONXS=y

# CONFIG_MACH_TRIZEPS4_ANY is not set

arch/arm/mach-clps711x/include/mach/memory.h

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ 
 * 	node 3:  0xd8000000 - 0xdfffffff

 */

#define NODE_MEM_SIZE_BITS	24

#define SECTION_SIZE_BITS	24

#define MAX_PHYSMEM_BITS	32



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE