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

Commit c5b84b3b authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of... 

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Conflicts:

	arch/arm/mach-pxa/pxa25x.c
parents d281bc9d bc2fd1c0

arch/arm/boot/compressed/head.S

+6 −0
Original line number Diff line number Diff line
@@ -624,6 +624,12 @@ proc_types: 
		b	__armv4_mmu_cache_off

		b	__armv4_mmu_cache_flush



		.word	0x56056930

		.word	0xff0ffff0		@ PXA935

		b	__armv4_mmu_cache_on

		b	__armv4_mmu_cache_off

		b	__armv4_mmu_cache_flush



		.word	0x56050000		@ Feroceon

		.word	0xff0f0000

		b	__armv4_mmu_cache_on

arch/arm/common/locomo.c

+1 −0
Original line number Diff line number Diff line
@@ -1108,6 +1108,7 @@ void locomo_frontlight_set(struct locomo_dev *dev, int duty, int vr, int bpwf) 
	locomo_writel(bpwf | LOCOMO_ALC_EN, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);

	spin_unlock_irqrestore(&lchip->lock, flags);

}

EXPORT_SYMBOL(locomo_frontlight_set);



/*

 *	LoCoMo "Register Access Bus."

arch/arm/configs/h5000_defconfig

0 → 100644
+996 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-pxa/Kconfig

+13 −1
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ config CPU_PXA320 
config CPU_PXA930

	bool "PXA930 (codename Tavor-P)"



config CPU_PXA935

	bool "PXA935 (codename Tavor-P65)"



endmenu



endif
@@ -199,6 +202,10 @@ config MACH_E800 
config TRIZEPS_PXA

	bool "PXA based Keith und Koep Trizeps DIMM-Modules"



config MACH_H5000

	bool "HP iPAQ h5000"

	select PXA25x



config MACH_TRIZEPS4

	bool "Keith und Koep Trizeps4 DIMM-Module"

	depends on TRIZEPS_PXA
@@ -283,7 +290,6 @@ config MACH_MIOA701 
	bool "Mitac Mio A701 Support"

	select PXA27x

	select IWMMXT

	select LEDS_GPIO

	select HAVE_PWM

	select GPIO_SYSFS

	help
@@ -396,6 +402,12 @@ config PXA27x 
	help

	  Select code specific to PXA27x variants



config CPU_PXA26x

	bool

	select PXA25x

	help

	  Select code specific to PXA26x (codename Dalhart)



config PXA3xx

	bool

	select CPU_XSC3

arch/arm/mach-pxa/Makefile

+1 −0

File changed.

Preview size limit exceeded, changes collapsed.