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

Commit 4c31791c 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
parents 98797a24 7517b3fb

MAINTAINERS

+12 −5
Original line number Diff line number Diff line
@@ -680,6 +680,13 @@ M: sakoman@gmail.com 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT

P:	Philipp Zabel

M:	philipp.zabel@gmail.com

S:	Maintained

F:	arch/arm/mach-pxa/hx4700.c

F:	arch/arm/mach-pxa/include/mach/hx4700.h



ARM/HP JORNADA 7XX MACHINE SUPPORT

P:	Kristoffer Ericson

M:	kristoffer.ericson@gmail.com
@@ -4627,7 +4634,7 @@ F: drivers/media/video/pvrusb2/ 


PXA2xx/PXA3xx SUPPORT

P:	Eric Miao

M:	eric.miao@marvell.com

M:	eric.y.miao@gmail.com

P:	Russell King

M:	linux@arm.linux.org.uk

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
@@ -4641,19 +4648,19 @@ F: sound/soc/pxa/pxa2xx* 


PXA168 SUPPORT

P:	Eric Miao

M:	eric.miao@marvell.com

M:	eric.y.miao@gmail.com

P:	Jason Chagas

M:	jason.chagas@marvell.com

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git

S:	Supported

S:	Maintained



PXA910 SUPPORT

P:	Eric Miao

M:	eric.miao@marvell.com

M:	eric.y.miao@gmail.com

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git

S:	Supported

S:	Maintained



PXA MMCI DRIVER

S:	Orphan

arch/arm/common/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -35,10 +35,6 @@ config SHARP_LOCOMO 
config SHARP_PARAM

	bool



config SHARPSL_PM

	bool

	select APM_EMULATION



config SHARP_SCOOP

	bool

arch/arm/common/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ obj-$(CONFIG_DMABOUNCE) += dmabounce.o 
obj-$(CONFIG_TIMER_ACORN)	+= time-acorn.o

obj-$(CONFIG_SHARP_LOCOMO)	+= locomo.o

obj-$(CONFIG_SHARP_PARAM)	+= sharpsl_param.o

obj-$(CONFIG_SHARPSL_PM)	+= sharpsl_pm.o

obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o

obj-$(CONFIG_ARCH_IXP2000)	+= uengine.o

obj-$(CONFIG_ARCH_IXP23XX)	+= uengine.o

arch/arm/common/sharpsl_pm.c

deleted100644 → 0
+0 −859

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/cm_x300_defconfig

+244 −85

File changed.

Preview size limit exceeded, changes collapsed.