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

Commit 65a6ec0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (95 commits)
  [ARM] 4578/1: CM-x270: PCMCIA support
  [ARM] 4577/1: ITE 8152 PCI bridge support
  [ARM] 4576/1: CM-X270 machine support
  [ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()
  [ARM] pxa: move pxa_set_mode() from pxa2xx_mainstone.c to mainstone.c
  [ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
  [ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols
  [ARM] pxa: PXA3xx base support
  [NET] smc91x: fix PXA DMA support code
  [SERIAL] Fix console initialisation ordering
  [ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
  [ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
  [ARM] 4600/1: fix kernel build failure with build-id-supporting binutils
  [ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
  [ARM] Rename consistent_sync() as dma_cache_maint()
  [ARM] 4572/1: ep93xx: add cirrus logic edb9307 support
  [ARM] 4596/1: S3C2412: Correct IRQs for SDI+CF and add decoding support
  [ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
  [ARM] 4594/1: ns9xxx: use the new gpio functions
  [ARM] 4593/1: ns9xxx: implement generic clockevents
  ...
parents 541010e4 0181b61a

Documentation/arm/00-INDEX

+16 −6
Original line number Diff line number Diff line
@@ -4,19 +4,29 @@ Booting 
	- requirements for booting

Interrupts

	- ARM Interrupt subsystem documentation

IXP2000

	- Release Notes for Linux on Intel's IXP2000 Network Processor

Netwinder

	- Netwinder specific documentation

Porting

       - Symbol definitions for porting Linux to a new ARM machine.

Setup

       - Kernel initialization parameters on ARM Linux

README

	- General ARM documentation

SA1100

SA1100/

	- SA1100 documentation

XScale

	- XScale documentation

empeg

	- Empeg documentation

Samsung-S3C24XX

	- S3C24XX ARM Linux Overview

Sharp-LH

	- Linux on Sharp LH79524 and LH7A40X System On a Chip (SOC)

VFP/

	- Release notes for Linux Kernel Vector Floating Point support code

empeg/

	- Ltd's Empeg MP3 Car Audio Player

mem_alignment

	- alignment abort handler documentation

memory.txt

	- description of the virtual memory layout

nwfpe

nwfpe/

	- NWFPE floating point emulator documentation

arch/arm/Kconfig

+16 −7
Original line number Diff line number Diff line
@@ -318,6 +318,9 @@ config ARCH_KS8695 


config ARCH_NS9XXX

	bool "NetSilicon NS9xxx"

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  Say Y here if you intend to run this kernel on a NetSilicon NS9xxx

	  System.
@@ -336,14 +339,14 @@ config ARCH_PNX4008 
	  This enables support for Philips PNX4008 mobile platform.



config ARCH_PXA

	bool "PXA2xx-based"

	bool "PXA2xx/PXA3xx-based"

	depends on MMU

	select ARCH_MTD_XIP

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

	  Support for Intel's PXA2XX processor line.

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.



config ARCH_RPC

	bool "RiscPC"
@@ -486,7 +489,7 @@ source arch/arm/mm/Kconfig 
config IWMMXT

	bool "Enable iWMMXt support"

	depends on CPU_XSCALE || CPU_XSC3

	default y if PXA27x

	default y if PXA27x || PXA3xx

	help

	  Enable support for iWMMXt context switching at run time if

	  running on a CPU that supports it.
@@ -994,6 +997,10 @@ source "drivers/pnp/Kconfig" 


source "drivers/block/Kconfig"



# misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4



source "drivers/misc/Kconfig"



if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \

	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \

	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \
@@ -1029,16 +1036,16 @@ source "drivers/spi/Kconfig" 


source "drivers/w1/Kconfig"



source "drivers/power/Kconfig"



source "drivers/hwmon/Kconfig"



#source "drivers/l3/Kconfig"

source "drivers/ssb/Kconfig"



source "drivers/misc/Kconfig"

#source "drivers/l3/Kconfig"



source "drivers/mfd/Kconfig"



source "drivers/leds/Kconfig"



source "drivers/media/Kconfig"



source "drivers/video/Kconfig"
@@ -1051,6 +1058,8 @@ source "drivers/usb/Kconfig" 


source "drivers/mmc/Kconfig"



source "drivers/leds/Kconfig"



source "drivers/rtc/Kconfig"



source "drivers/dma/Kconfig"

arch/arm/Kconfig-nommu

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ config FLASH_SIZE 
	default 0x00400000



config PROCESSOR_ID

	hex

	hex 'Hard wire the processor ID'

	default 0x00007700

	depends on !CPU_CP15

	help

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


LDFLAGS_vmlinux	:=-p --no-undefined -X

CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)

OBJCOPYFLAGS	:=-O binary -R .note -R .comment -S

OBJCOPYFLAGS	:=-O binary -R .note -R .note.gnu.build-id -R .comment -S

GZFLAGS		:=-9

#CFLAGS		+=-pipe

# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:

arch/arm/boot/compressed/head-xscale.S

+0 −4
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ __XScale_start: 
		bic	r0, r0, #0x1000		@ clear Icache

		mcr	p15, 0, r0, c1, c0, 0



#ifdef CONFIG_ARCH_LUBBOCK

		mov	r7, #MACH_TYPE_LUBBOCK

#endif



#ifdef CONFIG_ARCH_COTULLA_IDP

		mov	r7, #MACH_TYPE_COTULLA_IDP

#endif