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

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

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

parents a7a5ac58 75e874c6

arch/arm/mach-pxa/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ config MACH_CM_X300 
	bool "CompuLab CM-X300 modules"

	select PXA3xx

	select CPU_PXA300

	select CPU_PXA310

	select HAVE_PWM



config ARCH_GUMSTIX

	bool "Gumstix XScale 255 boards"
@@ -240,7 +242,6 @@ config MACH_COLIBRI300 
	select PXA3xx

	select CPU_PXA300

	select CPU_PXA310

	select HAVE_PWM



config MACH_COLIBRI320

	bool "Toradex Colibri PXA320"

arch/arm/mach-pxa/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#include <linux/platform_device.h>

#include <linux/dma-mapping.h>



#include <mach/hardware.h>

#include <mach/udc.h>

#include <mach/pxafb.h>

#include <mach/mmc.h>
@@ -14,6 +13,7 @@ 
#include <mach/pxa2xx_spi.h>

#include <mach/camera.h>

#include <mach/audio.h>

#include <mach/hardware.h>

#include <plat/i2c.h>

#include <plat/pxa3xx_nand.h>