Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b415269 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3543/1: [Fwd: PXA270 bootparams address not set]
  [ARM] Trivial typo fixes
parents b1c231f5 a7d14f87

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ config DEBUG_S3C2410_UART 
	help

	  Choice for UART for kernel low-level using S3C2410 UARTS,

	  should be between zero and two. The port must have been

	  initalised by the boot-loader before use.

	  initialised by the boot-loader before use.



	  The uncompressor code port configuration is now handled

	  by CONFIG_S3C2410_LOWLEVEL_UART_PORT.

arch/arm/mach-ixp4xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ config IXP4XX_INDIRECT_PCI 
          2) If > 64MB of memory space is required, the IXP4xx can be 

	     configured to use indirect registers to access PCI This allows 

	     for up to 128MB (0x48000000 to 0x4fffffff) of memory on the bus. 

	     The disadvantadge of this is that every PCI access requires 

	     The disadvantage of this is that every PCI access requires 

	     three local register accesses plus a spinlock, but in some 

	     cases the performance hit is acceptable. In addition, you cannot 

	     mmap() PCI devices in this case due to the indirect nature

arch/arm/mach-pxa/mainstone.c

+1 −0
Original line number Diff line number Diff line
@@ -493,6 +493,7 @@ static void __init mainstone_map_io(void) 
MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")

	/* Maintainer: MontaVista Software Inc. */

	.phys_io	= 0x40000000,

	.boot_params	= 0xa0000100,	/* BLOB boot parameter setting */

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.map_io		= mainstone_map_io,

	.init_irq	= mainstone_init_irq,

arch/arm/mach-s3c2410/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ config S3C2410_PM_DEBUG 
	depends on ARCH_S3C2410 && PM

	help

	  Say Y here if you want verbose debugging from the PM Suspend and

	  Resume code. See `Documentation/arm/Samsing-S3C24XX/Suspend.txt`

	  Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>

	  for more information.



config S3C2410_PM_CHECK