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

Commit 4246a9c9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mxs-fixes-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes 

From Shawn Guo:
The mxs fixes for 3.9:
 - A few sparse warning fixes
 - Fix usb function regression caused by usb Kconfig option changes

* tag 'mxs-fixes-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: mxs: ocotp: Fix sparse warning
  ARM: mxs: icoll: Fix sparse warning
  ARM: mxs: mm: Fix sparse warning
  ARM: mxs_defconfig: Make USB host functional again

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 260a8e50 95381f38

arch/arm/configs/mxs_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ CONFIG_SND_SOC=y 
CONFIG_SND_MXS_SOC=y

CONFIG_SND_SOC_MXS_SGTL5000=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_STORAGE=y

arch/arm/mach-mxs/icoll.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static struct irq_domain_ops icoll_irq_domain_ops = { 
	.xlate = irq_domain_xlate_onecell,

};



void __init icoll_of_init(struct device_node *np,

static void __init icoll_of_init(struct device_node *np,

			  struct device_node *interrupt_parent)

{

	/*

arch/arm/mach-mxs/mm.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <mach/mx23.h>

#include <mach/mx28.h>

#include <mach/common.h>



/*

 * Define the MX23 memory map.

arch/arm/mach-mxs/ocotp.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <asm/processor.h>	/* for cpu_relax() */



#include <mach/mxs.h>

#include <mach/common.h>



#define OCOTP_WORD_OFFSET		0x20

#define OCOTP_WORD_COUNT		0x20