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

Commit fc6cca39 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branches 'sh/compressors' and 'sh/stable-updates'

parents 6bde607e ef9b542f aea1f796

arch/arm/configs/u300_defconfig

+8 −10
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.31-rc1

# Thu Jul  2 00:16:59 2009

# Linux kernel version: 2.6.31-rc3

# Thu Jul 16 23:36:10 2009

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -9,7 +9,6 @@ CONFIG_GENERIC_GPIO=y 
CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_MMU=y

CONFIG_HAVE_TCM=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -113,7 +112,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_BLOCK=y

CONFIG_LBDAF=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -542,13 +541,14 @@ CONFIG_INPUT_EVDEV=y 
#

CONFIG_INPUT_KEYBOARD=y

# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_KEYBOARD_SUNKBD is not set

# CONFIG_KEYBOARD_LKKBD is not set

# CONFIG_KEYBOARD_XTKBD is not set

# CONFIG_KEYBOARD_GPIO is not set

# CONFIG_KEYBOARD_MATRIX is not set

# CONFIG_KEYBOARD_LM8323 is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

# CONFIG_KEYBOARD_LM8323 is not set

# CONFIG_KEYBOARD_GPIO is not set

# CONFIG_KEYBOARD_SUNKBD is not set

# CONFIG_KEYBOARD_XTKBD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set
@@ -911,7 +911,6 @@ CONFIG_REGULATOR=y 
# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

CONFIG_FILE_LOCKING=y
@@ -1122,7 +1121,6 @@ CONFIG_GENERIC_FIND_LAST_BIT=y 
# CONFIG_CRC32 is not set

# CONFIG_CRC7 is not set

# CONFIG_LIBCRC32C is not set

CONFIG_GENERIC_ALLOCATOR=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

arch/arm/mach-ep93xx/dma-m2p.c

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

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/io.h>



#include <mach/dma.h>

#include <mach/hardware.h>

arch/arm/mach-kirkwood/mpp.h

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ 


#define MPP48_GPIO		MPP( 48, 0x0, 1, 1, 0,   0,   0,   1    )

#define MPP48_TSMP12		MPP( 48, 0x1, 1, 1, 0,   0,   0,   1    )

#define MPP48_TDM_DTX		MPP( 48. 0x2, 0, 1, 0,   0,   0,   1    )

#define MPP48_TDM_DTX		MPP( 48, 0x2, 0, 1, 0,   0,   0,   1    )



#define MPP49_GPIO		MPP( 49, 0x0, 1, 1, 0,   0,   0,   1    )

#define MPP49_TSMP9		MPP( 49, 0x1, 1, 1, 0,   0,   0,   1    )

arch/arm/mach-mx3/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ config MACH_PCM037 
	  Include support for Phytec pcm037 platform. This includes

	  specific configurations for the board and its peripherals.



config MACH_PCM037_EET

	bool "Support pcm037 EET board extensions"

	depends on MACH_PCM037

	help

	  Add support for PCM037 EET baseboard extensions. If you are using the

	  OLED display with EET, use "video=mx3fb:CMEL-OLED" kernel

	  command-line parameter.



config MACH_MX31LITE

	bool "Support MX31 LITEKIT (LogicPD)"

	select ARCH_MX31

arch/arm/mach-mx3/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_MACH_MX31ADS) += mx31ads.o 
obj-$(CONFIG_MACH_MX31LILLY)	+= mx31lilly.o mx31lilly-db.o

obj-$(CONFIG_MACH_MX31LITE)	+= mx31lite.o

obj-$(CONFIG_MACH_PCM037)	+= pcm037.o

obj-$(CONFIG_MACH_PCM037_EET)	+= pcm037_eet.o

obj-$(CONFIG_MACH_MX31_3DS)	+= mx31pdk.o

obj-$(CONFIG_MACH_MX31MOBOARD)	+= mx31moboard.o mx31moboard-devboard.o \

				   mx31moboard-marxbot.o