r3587 - branches/src/target/kernel/2.6.24.x/patches

laforge at sita.openmoko.org laforge at sita.openmoko.org
Thu Dec 6 07:14:04 CET 2007


Author: laforge
Date: 2007-12-06 07:14:02 +0100 (Thu, 06 Dec 2007)
New Revision: 3587

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta02-sound.patch
Log:
make gta02-sound.patch compile with 2.6.24.x


Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-sound.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-sound.patch	2007-12-06 06:13:39 UTC (rev 3586)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-sound.patch	2007-12-06 06:14:02 UTC (rev 3587)
@@ -1,7 +1,7 @@
-Index: linux-2.6.22/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+Index: linux-2.6/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/sound/soc/s3c24xx/neo1973_gta02_wm8753.c	2007-11-06 16:35:52.000000000 +0000
+--- /dev/null
++++ linux-2.6/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
 @@ -0,0 +1,662 @@
 +/*
 + * neo1973_gta02_wm8753.c  --  SoC audio for Neo1973
@@ -37,7 +37,7 @@
 +
 +#include <asm/mach-types.h>
 +#include <asm/hardware/scoop.h>
-+#include <asm/arch/regs-iis.h>
++#include <asm/plat-s3c24xx/regs-iis.h>
 +#include <asm/arch/regs-clock.h>
 +#include <asm/arch/regs-gpio.h>
 +#include <asm/hardware.h>
@@ -665,10 +665,10 @@
 +MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973 GTA02");
 +MODULE_LICENSE("GPL");
 +
-Index: linux-2.6.22/sound/soc/s3c24xx/Kconfig
+Index: linux-2.6/sound/soc/s3c24xx/Kconfig
 ===================================================================
---- linux-2.6.22.orig/sound/soc/s3c24xx/Kconfig	2007-11-06 15:31:50.000000000 +0000
-+++ linux-2.6.22/sound/soc/s3c24xx/Kconfig	2007-11-06 15:31:55.000000000 +0000
+--- linux-2.6.orig/sound/soc/s3c24xx/Kconfig
++++ linux-2.6/sound/soc/s3c24xx/Kconfig
 @@ -25,6 +25,15 @@
  	  Say Y if you want to add support for SoC audio on smdk2440
  	  with the WM8753.
@@ -685,10 +685,10 @@
  config SND_S3C24XX_SOC_SMDK2443_WM9710
  	tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
  	depends on SND_S3C24XX_SOC && MACH_SMDK2443
-Index: linux-2.6.22/sound/soc/s3c24xx/Makefile
+Index: linux-2.6/sound/soc/s3c24xx/Makefile
 ===================================================================
---- linux-2.6.22.orig/sound/soc/s3c24xx/Makefile	2007-11-06 15:31:49.000000000 +0000
-+++ linux-2.6.22/sound/soc/s3c24xx/Makefile	2007-11-06 15:31:55.000000000 +0000
+--- linux-2.6.orig/sound/soc/s3c24xx/Makefile
++++ linux-2.6/sound/soc/s3c24xx/Makefile
 @@ -10,6 +10,9 @@
  # S3C24XX Machine Support
  snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o
@@ -699,10 +699,10 @@
  obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o
 +obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o
 +
-Index: linux-2.6.22/include/sound/soc-dapm.h
+Index: linux-2.6/include/sound/soc-dapm.h
 ===================================================================
---- linux-2.6.22.orig/include/sound/soc-dapm.h	2007-07-09 00:32:17.000000000 +0100
-+++ linux-2.6.22/include/sound/soc-dapm.h	2007-11-06 15:31:55.000000000 +0000
+--- linux-2.6.orig/include/sound/soc-dapm.h
++++ linux-2.6/include/sound/soc-dapm.h
 @@ -206,6 +206,8 @@
  /* dapm audio endpoint control */
  int snd_soc_dapm_set_endpoint(struct snd_soc_codec *codec,
@@ -712,10 +712,10 @@
  int snd_soc_dapm_sync_endpoints(struct snd_soc_codec *codec);
  
  /* dapm widget types */
-Index: linux-2.6.22/sound/soc/soc-dapm.c
+Index: linux-2.6/sound/soc/soc-dapm.c
 ===================================================================
---- linux-2.6.22.orig/sound/soc/soc-dapm.c	2007-07-09 00:32:17.000000000 +0100
-+++ linux-2.6.22/sound/soc/soc-dapm.c	2007-11-06 15:31:55.000000000 +0000
+--- linux-2.6.orig/sound/soc/soc-dapm.c
++++ linux-2.6/sound/soc/soc-dapm.c
 @@ -1305,6 +1305,30 @@
  EXPORT_SYMBOL_GPL(snd_soc_dapm_set_endpoint);
  





More information about the commitlog mailing list