diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/alsa/alsa-driver | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/alsa/alsa-driver')
-rw-r--r-- | packages/alsa/alsa-driver/adriver.h.patch | 23 | ||||
-rw-r--r-- | packages/alsa/alsa-driver/h5400.patch | 12 | ||||
-rw-r--r-- | packages/alsa/alsa-driver/sa11xx.patch | 38 | ||||
-rw-r--r-- | packages/alsa/alsa-driver/sound.p.patch | 59 |
4 files changed, 0 insertions, 132 deletions
diff --git a/packages/alsa/alsa-driver/adriver.h.patch b/packages/alsa/alsa-driver/adriver.h.patch deleted file mode 100644 index cd648838c0..0000000000 --- a/packages/alsa/alsa-driver/adriver.h.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ./include/adriver.h.orig 2003-09-22 22:04:21.000000000 +0200 -+++ ./include/adriver.h 2005-06-26 10:33:15.000000000 +0200 -@@ -328,8 +328,18 @@ - #endif /* SND_NEED_USB_WRAPPER && CONFIG_USB */ - - /* workqueue-alike; 2.5.45 */ --#include <linux/workqueue.h> -+#include <linux/workqueue.h> - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 45) && !defined(__WORK_INITIALIZER) -+#ifdef work_struct -+#undef work_struct -+#endif -+#ifdef INIT_WORK -+#undef INIT_WORK -+#endif -+#ifdef schedule_work -+#undef schedule_work -+#endif -+ - struct work_struct { - void (*func)(void *); - void *data; - diff --git a/packages/alsa/alsa-driver/h5400.patch b/packages/alsa/alsa-driver/h5400.patch deleted file mode 100644 index e156708783..0000000000 --- a/packages/alsa/alsa-driver/h5400.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./alsa-kernel/arm/h5400-ak4535.c.orig 2005-06-26 22:12:57.000000000 +0200 -+++ ./alsa-kernel/arm/h5400-ak4535.c 2005-06-26 22:13:08.000000000 +0200 -@@ -36,7 +36,7 @@ - #include <asm/arch-sa1100/h3600_hal.h> - #include <asm/arch-sa1100/h3600_asic.h> - #include <asm/arch-pxa/h5400-asic.h> --#include <asm/arch-pxa/pxa-i2s.h> -+#include <drivers/sound/pxa-i2s.h> - - #include <sound/core.h> - #include <sound/pcm.h> - diff --git a/packages/alsa/alsa-driver/sa11xx.patch b/packages/alsa/alsa-driver/sa11xx.patch deleted file mode 100644 index 34509b13b0..0000000000 --- a/packages/alsa/alsa-driver/sa11xx.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ./alsa-kernel/arm/sa11xx-uda1341.c 2005-06-27 12:59:53.000000000 +0200 -+++ ./alsa-kernel/arm/sa11xx-uda1341.c.orig 2005-06-27 12:59:29.000000000 +0200 -@@ -366,7 +366,7 @@ - DEBUG("\t request id <%s>\n", s->id); - DEBUG("\t request dma_dev = 0x%x \n", s->dma_dev); - if((ret = sa1100_request_dma((s)->dma_dev, (s)->id, callback, s, &((s)->dma_regs)))) -- printk(__FUNCTION__ ": sa1100_request_dma returned %d\n",ret); -+ printk("%s: sa1100_request_dma returned %d\n",__FUNCTION__,ret); - - - -@@ -978,7 +978,7 @@ - switch (req) { - case PM_SUSPEND: /* enter D1-D3 */ - if (card->power_state == SNDRV_CTL_POWER_D3hot){ -- printk(__FUNCTION__ ": exiting eraly from suspend\n"); -+ printk("%s: exiting eraly from suspend\n",__FUNCTION__); - return 0; - } - snd_power_lock(card); -@@ -1002,7 +1002,7 @@ - case PM_RESUME: /* enter D0 */ - - if (card->power_state == SNDRV_CTL_POWER_D0){ -- printk(__FUNCTION__ ": exiting eraly from resume\n"); -+ printk("%s: exiting eraly from resume\n",__FUNCTION__); - return 0; - } - snd_power_lock(card); -@@ -1020,7 +1020,7 @@ - - break; - } -- printk(KERN_DEBUG __FUNCTION__": exiting...\n"); -+ printk(KERN_DEBUG "%s: exiting...\n",__FUNCTION__); - return 0; - - } diff --git a/packages/alsa/alsa-driver/sound.p.patch b/packages/alsa/alsa-driver/sound.p.patch deleted file mode 100644 index 38b073c8bd..0000000000 --- a/packages/alsa/alsa-driver/sound.p.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- ./acore/sound.patch.orig 2003-07-03 16:05:15.000000000 +0200 -+++ ./acore/sound.patch 2005-06-26 09:45:05.000000000 +0200 -@@ -1,6 +1,26 @@ ----- sound.c 2003-05-30 15:29:14.000000000 +0200 --+++ sound.c.old 2003-05-30 15:30:11.000000000 +0200 --@@ -154,7 +154,9 @@ -+--- sound.c.orig 2005-06-25 23:33:07.000000000 +0200 -++++ sound.c 2005-06-25 23:33:07.000000000 +0200 -+@@ -77,6 +77,7 @@ -+ void snd_request_card(int card) -+ { -+ int locked; -++ char *str; -+ -+ read_lock(&snd_card_rwlock); -+ locked = snd_cards_lock & (1 << card); -+@@ -85,7 +86,10 @@ -+ return; -+ if (card < 0 || card >= cards_limit) -+ return; -+- request_module("snd-card-%i", card); -++ str = kmalloc(15,GFP_KERNEL); -++ snprintf(str,15,"snd-card-%i",card); -++ request_module(str); -++ kfree(str); -+ } -+ -+ static void snd_request_other(int minor) -+@@ -154,7 +158,9 @@ - - struct file_operations snd_fops = - { -@@ -10,7 +30,7 @@ - .open = snd_open - }; - --@@ -364,6 +366,9 @@ -+@@ -364,6 +370,9 @@ - #ifndef MODULE - printk(KERN_INFO "Advanced Linux Sound Architecture Driver Version " CONFIG_SND_VERSION CONFIG_SND_DATE ".\n"); - #endif -@@ -20,7 +40,7 @@ - return 0; - } - --@@ -378,6 +383,9 @@ -+@@ -378,6 +387,9 @@ - snd_info_minor_unregister(); - #endif - snd_info_done(); -@@ -30,7 +50,7 @@ - #ifdef CONFIG_SND_DEBUG_MEMORY - snd_memory_done(); - #endif --@@ -490,3 +498,5 @@ -+@@ -508,3 +520,5 @@ - EXPORT_SYMBOL(snd_wrapper_vmalloc); - EXPORT_SYMBOL(snd_wrapper_vfree); - #endif |