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

Commit e55d1936 authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel' of...

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
parents 74d2e4f8 e7cc8941
Loading
Loading
Loading
Loading
+1898 −0

File added.

Preview size limit exceeded, changes collapsed.

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@

#include "common.h"

#define ARRAY_AND_SIZE(x)       (x), ARRAY_SIZE(x)

static unsigned long ttc_dkb_pin_config[] __initdata = {
	/* UART2 */
	GPIO47_UART2_RXD,
+18 −0
Original line number Diff line number Diff line
@@ -415,6 +415,24 @@ config MACH_TREO680
	  Say Y here if you intend to run this kernel on Palm Treo 680
	  smartphone.

config MACH_RAUMFELD_RC
	bool "Raumfeld Controller"
	select PXA3xx
	select CPU_PXA300
	select HAVE_PWM

config MACH_RAUMFELD_CONNECTOR
	bool "Raumfeld Connector"
	select PXA3xx
	select CPU_PXA300
	select PXA_SSP

config MACH_RAUMFELD_SPEAKER
	bool "Raumfeld Speaker"
	select PXA3xx
	select CPU_PXA300
	select PXA_SSP

config PXA_SHARPSL
	bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
	select SHARP_SCOOP
+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ 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_RAUMFELD_RC)		+= raumfeld.o
obj-$(CONFIG_MACH_RAUMFELD_CONNECTOR)	+= raumfeld.o
obj-$(CONFIG_MACH_RAUMFELD_SPEAKER)	+= raumfeld.o

# Support for blinky lights
led-y := leds.o
+1100 −0

File added.

Preview size limit exceeded, changes collapsed.