diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-11 20:14:39 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-11 20:14:39 +0000 |
| commit | 8c399739caea5e7390f845f76043bb3a54619ba6 (patch) | |
| tree | f36bbefa029c0849b8af1441dfa5b143128c3078 /target/linux/generic/patches-3.6 | |
| parent | e2f1cef21f7a2667a7a02e3abdb90f4d246616ff (diff) | |
kernel: update linux 3.6 to 3.6.10
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34639 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6')
3 files changed, 3 insertions, 31 deletions
diff --git a/target/linux/generic/patches-3.6/065-8139cp-fixes.patch b/target/linux/generic/patches-3.6/065-8139cp-fixes.patch index 149fb65c7..7732b277b 100644 --- a/target/linux/generic/patches-3.6/065-8139cp-fixes.patch +++ b/target/linux/generic/patches-3.6/065-8139cp-fixes.patch @@ -146,25 +146,7 @@ Date: Wed Nov 21 10:27:19 2012 +0000 cp_reset_hw(cp); -@@ -979,17 +1017,6 @@ static void cp_init_hw (struct cp_privat - cpw32_f (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0))); - cpw32_f (MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4))); - -- cpw32_f(HiTxRingAddr, 0); -- cpw32_f(HiTxRingAddr + 4, 0); -- -- ring_dma = cp->ring_dma; -- cpw32_f(RxRingAddr, ring_dma & 0xffffffff); -- cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16); -- -- ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE; -- cpw32_f(TxRingAddr, ring_dma & 0xffffffff); -- cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16); -- - cp_start_hw(cp); - cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */ - -@@ -1192,6 +1219,7 @@ static void cp_tx_timeout(struct net_dev +@@ -1192,6 +1230,7 @@ static void cp_tx_timeout(struct net_dev cp_clean_rings(cp); rc = cp_init_rings(cp); cp_start_hw(cp); diff --git a/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch b/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch index f29721815..3afff7138 100644 --- a/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch +++ b/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch @@ -13,13 +13,11 @@ Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> sound/soc/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/sound/soc/Makefile b/sound/soc/Makefile -index bcbf1d0..99f32f7 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -1,8 +1,9 @@ snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o - snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o + snd-soc-core-objs += soc-pcm.o soc-io.o -snd-soc-dmaengine-pcm-objs := soc-dmaengine-pcm.o -obj-$(CONFIG_SND_SOC_DMAENGINE_PCM) += snd-soc-dmaengine-pcm.o @@ -29,6 +27,3 @@ index bcbf1d0..99f32f7 100644 obj-$(CONFIG_SND_SOC) += snd-soc-core.o obj-$(CONFIG_SND_SOC) += codecs/ --- -1.7.10.4 - diff --git a/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch b/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch index 402304278..f95e06dca 100644 --- a/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch +++ b/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch @@ -16,8 +16,6 @@ Dmitry, can you try to push this to Linus before 3.7 final? Thank you drivers/input/matrix-keymap.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c -index 443ad64b..d88d9be 100644 --- a/drivers/input/matrix-keymap.c +++ b/drivers/input/matrix-keymap.c @@ -23,6 +23,7 @@ @@ -28,12 +26,9 @@ index 443ad64b..d88d9be 100644 #include <linux/input/matrix_keypad.h> static bool matrix_keypad_map_key(struct input_dev *input_dev, -@@ -161,3 +162,5 @@ int matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data, +@@ -161,3 +162,5 @@ int matrix_keypad_build_keymap(const str return 0; } EXPORT_SYMBOL(matrix_keypad_build_keymap); + +MODULE_LICENSE("GPL"); --- -1.7.10.4 - |