projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a421296 b05f5c1)
Merge branch 'mxc-audio' into for-2.6.34
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 17 Jan 2010 16:47:32 +0000 (16:47 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 17 Jan 2010 16:47:32 +0000 (16:47 +0000)
Conflicts:
arch/arm/plat-mxc/Makefile (dual add)
sound/soc/imx/mx27vis_wm8974.c (API updates & removal)

1  2 
arch/arm/plat-mxc/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/plat-mxc/Makefile
index 996cbac6932c77995650735715e9784c8bb5fbb5,b0b9fc3e5ab075a417b7e8e190cdb52a837042f2..6cee38df58b27c145841a571e35e645175189ad3
--- 1/arch/arm/plat-mxc/Makefile
--- 2/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@@ -9,7 -9,9 +9,11 @@@ obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2
  obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o
  obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
  obj-$(CONFIG_MXC_PWM)  += pwm.o
 +obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
 +obj-$(CONFIG_MXC_ULPI) += ulpi.o
  obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
  obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
+ ifdef CONFIG_SND_IMX_SOC
+ obj-y += ssi-fiq.o
+ obj-y += ssi-fiq-ksym.o
+ endif