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

Commit 0d876c6a 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] pxa: corgi backlight driver should not select ssp drivers
  [ARM] 5321/1: Kirkwood: fix typo in Makefile
  [ARM] 5320/1: fix assembly constraints in implementation of do_div()
  [ARM] 5318/1: Swap the PRRR and NMRR values in proc-v7.S
  [ARM] 5316/1: AT91: oops (regression) fix on gpio irq
  [ARM] msm: vreg interface to msm7k pmic
  [ARM] msm: dma: various basic dma improvements and bugfixes
  [ARM] msm: clock: provide clk_*() api support for
  [ARM] msm: clean up iomap and devices
  [ARM] msm: add proc_comm support, necessary for clock and power control
  [ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM
  [ARM] pxa/spitz: fix unbalance parenthesis in header file spitz.h
  [ARM] pxa: update {corgi,spitz}_defconfig to favor SPI-based drivers
  [ARM] pxa: fix the corgi_ssp.c dependency issue in {corgi,spitz}_defconfig
  Revert "[ARM] pxa/corgi: remove now unused corgi_ssp.c and corgi_lcd.c"
parents 900bca34 6ffab0ef

arch/arm/Kconfig

+4 −5
Original line number Original line Diff line number Diff line
@@ -540,16 +540,15 @@ config ARCH_OMAP 
	help

	help

	  Support for TI's OMAP platform (OMAP1 and OMAP2).

	  Support for TI's OMAP platform (OMAP1 and OMAP2).





config ARCH_MSM7X00A

config ARCH_MSM

	bool "Qualcomm MSM7X00A"

	bool "Qualcomm MSM"

	select GENERIC_TIME

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	help

	help

	  Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11

	  Support for Qualcomm MSM7K based systems.  This runs on the ARM11

	  apps processor of the MSM7X00A and depends on a shared memory

	  apps processor of the MSM7K and depends on a shared memory

	  interface to the ARM9 modem processor which runs the baseband stack

	  interface to the ARM9 modem processor which runs the baseband stack

	  and controls some vital subsystems (clock and power control, etc).

	  and controls some vital subsystems (clock and power control, etc).

	  <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>





endchoice

endchoice

arch/arm/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -141,7 +141,7 @@ endif 
 machine-$(CONFIG_ARCH_MX3)	   := mx3

 machine-$(CONFIG_ARCH_MX3)	   := mx3

 machine-$(CONFIG_ARCH_ORION5X)	   := orion5x

 machine-$(CONFIG_ARCH_ORION5X)	   := orion5x

    plat-$(CONFIG_PLAT_ORION)	   := orion

    plat-$(CONFIG_PLAT_ORION)	   := orion

 machine-$(CONFIG_ARCH_MSM7X00A)   := msm

 machine-$(CONFIG_ARCH_MSM)	   := msm

 machine-$(CONFIG_ARCH_LOKI)       := loki

 machine-$(CONFIG_ARCH_LOKI)       := loki

 machine-$(CONFIG_ARCH_MV78XX0)    := mv78xx0

 machine-$(CONFIG_ARCH_MV78XX0)    := mv78xx0

arch/arm/configs/corgi_defconfig

+862 −534

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/msm_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -133,7 +133,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_OMAP is not set

CONFIG_ARCH_MSM7X00A=y

CONFIG_ARCH_MSM=y





#

#

# Boot options

# Boot options

arch/arm/configs/spitz_defconfig

+828 −466

File changed.

Preview size limit exceeded, changes collapsed.