[oe-commits] org.oe.dev linux-rp: Fix pcmcia ids patch, Use ASoC patches directly from Wolfson for >= 2.6.18

rpurdie commit openembedded-commits at lists.openembedded.org
Thu Dec 7 09:46:50 UTC 2006


linux-rp: Fix pcmcia ids patch, Use ASoC patches directly from Wolfson for >= 2.6.18

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 8150342bcdc33e82cc39d148edca7a67e763c54e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8150342bcdc33e82cc39d148edca7a67e763c54e
Files:
1
packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch
packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch
packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch
packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch
packages/linux/linux-rp-2.6.19/hrw-pcmcia-ids-r5.patch
packages/linux/linux-rp_2.6.18+git.bb
packages/linux/linux-rp_2.6.18.bb
packages/linux/linux-rp_2.6.19.bb
Diffs:

#
# mt diff -rc1121a577aa515400ecc0c0b09d8d1d26be80832 -r8150342bcdc33e82cc39d148edca7a67e763c54e
#
# 
# 
# patch "packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch"
#  from [d31bb0121bea25aba984de3388f5f27d9223183d]
#    to [300d770f336f0dc8491f739af0aecb4024a16a61]
# 
# patch "packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch"
#  from [d31bb0121bea25aba984de3388f5f27d9223183d]
#    to [300d770f336f0dc8491f739af0aecb4024a16a61]
# 
# patch "packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch"
#  from [d31bb0121bea25aba984de3388f5f27d9223183d]
#    to [300d770f336f0dc8491f739af0aecb4024a16a61]
# 
# patch "packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch"
#  from [d31bb0121bea25aba984de3388f5f27d9223183d]
#    to [300d770f336f0dc8491f739af0aecb4024a16a61]
# 
# patch "packages/linux/linux-rp-2.6.19/hrw-pcmcia-ids-r5.patch"
#  from [d31bb0121bea25aba984de3388f5f27d9223183d]
#    to [300d770f336f0dc8491f739af0aecb4024a16a61]
# 
# patch "packages/linux/linux-rp_2.6.18+git.bb"
#  from [ce130fe8ef61e0ca4a1db9db6b491f1957422280]
#    to [7c2ce36bc904e28b5bf989b6b03659b4323f10ba]
# 
# patch "packages/linux/linux-rp_2.6.18.bb"
#  from [cbb19dd6181d577e7e43d77f504f4d510cf429ef]
#    to [5e80bf4d7f0baae240a7800b4eee81ca914b6f47]
# 
# patch "packages/linux/linux-rp_2.6.19.bb"
#  from [bc9457cf2b40cd8ac0a106429873ac6ab8a894bb]
#    to [f76d1faba0059fb2058d5bc3edf2c88321ec0f34]
# 
============================================================
--- packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch	d31bb0121bea25aba984de3388f5f27d9223183d
+++ packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch	300d770f336f0dc8491f739af0aecb4024a16a61
@@ -56,7 +56,7 @@ Index: linux-2.6.18/drivers/net/pcmcia/p
  	PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
  	PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
  		0xb4be14e3, 0x43ac239b, 0x0877b627),
-+	PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",exit
++	PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",
 +		0x00b2e941, 0x43ac239b, 0x0877b627),
  	PCMCIA_DEVICE_NULL
  };
============================================================
--- packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch	d31bb0121bea25aba984de3388f5f27d9223183d
+++ packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch	300d770f336f0dc8491f739af0aecb4024a16a61
@@ -56,7 +56,7 @@ Index: linux-2.6.18/drivers/net/pcmcia/p
  	PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
  	PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
  		0xb4be14e3, 0x43ac239b, 0x0877b627),
-+	PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",exit
++	PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",
 +		0x00b2e941, 0x43ac239b, 0x0877b627),
  	PCMCIA_DEVICE_NULL
  };
============================================================
--- packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch	d31bb0121bea25aba984de3388f5f27d9223183d
+++ packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch	300d770f336f0dc8491f739af0aecb4024a16a61
@@ -56,7 +56,7 @@ Index: linux-2.6.18/drivers/net/pcmcia/p
  	PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
  	PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
  		0xb4be14e3, 0x43ac239b, 0x0877b627),
-+	PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",exit
++	PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",
 +		0x00b2e941, 0x43ac239b, 0x0877b627),
  	PCMCIA_DEVICE_NULL
  };
============================================================
--- packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch	d31bb0121bea25aba984de3388f5f27d9223183d
+++ packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch	300d770f336f0dc8491f739af0aecb4024a16a61
@@ -56,7 +56,7 @@ Index: linux-2.6.18/drivers/net/pcmcia/p
  	PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
  	PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
  		0xb4be14e3, 0x43ac239b, 0x0877b627),
-+	PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",exit
++	PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",
 +		0x00b2e941, 0x43ac239b, 0x0877b627),
  	PCMCIA_DEVICE_NULL
  };
============================================================
--- packages/linux/linux-rp-2.6.19/hrw-pcmcia-ids-r5.patch	d31bb0121bea25aba984de3388f5f27d9223183d
+++ packages/linux/linux-rp-2.6.19/hrw-pcmcia-ids-r5.patch	300d770f336f0dc8491f739af0aecb4024a16a61
@@ -56,7 +56,7 @@ Index: linux-2.6.18/drivers/net/pcmcia/p
  	PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
  	PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
  		0xb4be14e3, 0x43ac239b, 0x0877b627),
-+	PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",exit
++	PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",
 +		0x00b2e941, 0x43ac239b, 0x0877b627),
  	PCMCIA_DEVICE_NULL
  };
============================================================
--- packages/linux/linux-rp_2.6.18+git.bb	ce130fe8ef61e0ca4a1db9db6b491f1957422280
+++ packages/linux/linux-rp_2.6.18+git.bb	7c2ce36bc904e28b5bf989b6b03659b4323f10ba
@@ -15,8 +15,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ae99a78af33f00565a05dbbc6ca9b247fed002c5 \
-           ${RPSRC}/alsa/asoc-v0.12.4.patch;patch=1 \
-           ${RPSRC}/asoc_makefile-r1.patch;patch=1 \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
            ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
============================================================
--- packages/linux/linux-rp_2.6.18.bb	cbb19dd6181d577e7e43d77f504f4d510cf429ef
+++ packages/linux/linux-rp_2.6.18.bb	5e80bf4d7f0baae240a7800b4eee81ca914b6f47
@@ -13,8 +13,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
-           ${RPSRC}/alsa/asoc-v0.12.4.patch;patch=1 \
-           ${RPSRC}/asoc_makefile-r1.patch;patch=1 \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
            ${RPSRC}/poodle_audio-r6.patch;patch=1 \
            ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
============================================================
--- packages/linux/linux-rp_2.6.19.bb	bc9457cf2b40cd8ac0a106429873ac6ab8a894bb
+++ packages/linux/linux-rp_2.6.19.bb	f76d1faba0059fb2058d5bc3edf2c88321ec0f34
@@ -15,8 +15,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
-           ${RPSRC}/alsa/asoc-v0.12.4.patch;patch=1 \
-           ${RPSRC}/asoc_makefile-r1.patch;patch=1 \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
            ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \






More information about the Openembedded-commits mailing list