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

Commit 89de3820 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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

parents 3ef48fac 80748fb8

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ P: Dirk Opfer 
M:	dirk@opfer-online.de

S:	Maintained



ARM/PALMTX,PALMT5,PALMLD SUPPORT

ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT

P:	Marek Vasut

M:	marek.vasut@gmail.com

W:	http://hackndev.com

arch/arm/configs/magician_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,11 @@ CONFIG_RTC_INTF_DEV=y 
CONFIG_RTC_DRV_SA1100=y

# CONFIG_RTC_DRV_PXA is not set

# CONFIG_DMADEVICES is not set

# CONFIG_REGULATOR is not set

CONFIG_REGULATOR=y

# CONFIG_REGULATOR_DEBUG is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

CONFIG_REGULATOR_BQ24022=y

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

arch/arm/mach-pxa/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -343,6 +343,15 @@ config ARCH_PXA_PALM 
	bool "PXA based Palm PDAs"

	select HAVE_PWM



config MACH_PALMTE2

	bool "Palm Tungsten|E2"

	default y

	depends on ARCH_PXA_PALM

	select PXA25x

	help

	  Say Y here if you intend to run this kernel on a Palm Tungsten|E2

	  handheld computer.



config MACH_PALMT5

	bool "Palm Tungsten|T5"

	default y

arch/arm/mach-pxa/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ obj-$(CONFIG_MACH_E740) += e740.o 
obj-$(CONFIG_MACH_E750)		+= e750.o

obj-$(CONFIG_MACH_E400)		+= e400.o

obj-$(CONFIG_MACH_E800)		+= e800.o

obj-$(CONFIG_MACH_PALMTE2)	+= palmte2.o

obj-$(CONFIG_MACH_PALMT5)	+= palmt5.o

obj-$(CONFIG_MACH_PALMTX)	+= palmtx.o

obj-$(CONFIG_MACH_PALMLD)	+= palmld.o

arch/arm/mach-pxa/cm-x2xx.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static inline void cmx2xx_init_dm9000(void) {} 
/* UCB1400 touchscreen controller */

#if defined(CONFIG_TOUCHSCREEN_UCB1400) || defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE)

static struct platform_device cmx2xx_ts_device = {

	.name		= "ucb1400_ts",

	.name		= "ucb1400_core",

	.id		= -1,

};