diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-07-08 01:28:52 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-07-08 01:28:52 +0000 |
| commit | 4bac3cbba68039a835ae747a45b1c76995da7552 (patch) | |
| tree | 67df03fae90a5a84ec6b1b2b969260c92f96239c /packages/linux | |
| parent | 154af708451cce6148f55a8942c03d29d90c7fc7 (diff) | |
| parent | ce990bd80f75f0d33d15e9f21f516419f5675390 (diff) | |
merge of '5076ed26abde44cf0e9a27bb249bb0829b19ea16'
and '9a0ea0926b71ceec737d423255d8fce2074cc8b7'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/ixp4xx-kernel.inc | 2 | ||||
| -rw-r--r-- | packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch | 17 | ||||
| -rw-r--r-- | packages/linux/linux-rp_2.6.21.bb | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 1c9d004d0f..367685f112 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -151,7 +151,7 @@ SRC_URI = "${IXP4XX_SRCURI}" SRC_URI += "${IXP4XX_PATCHES}" COMPATIBLE_HOST = 'arm.*-linux.*' -COMPATIBLE_MACHINE = '(ixp4xx|nslu2)' +COMPATIBLE_MACHINE = '(ixp4xx|nslu2|fsg3)' inherit kernel diff --git a/packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch b/packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch new file mode 100644 index 0000000000..b5439c62e7 --- /dev/null +++ b/packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch @@ -0,0 +1,17 @@ +Index: linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c +=================================================================== +--- linux-2.6.21.orig/drivers/net/wireless/hostap/hostap_hw.c 2007-07-07 12:45:39.000000000 +0100 ++++ linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c 2007-07-07 12:47:30.000000000 +0100 +@@ -2666,6 +2666,12 @@ + iface = netdev_priv(dev); + local = iface->local; + ++ if(dev->base_addr == 0) ++ { ++ printk(KERN_DEBUG "%s: IRQ before base_addr set\n", dev->name); ++ return IRQ_HANDLED; ++ } ++ + prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0); + + if (local->func->card_present && !local->func->card_present(local)) { diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb index 5c3b5e3a28..980732d409 100644 --- a/packages/linux/linux-rp_2.6.21.bb +++ b/packages/linux/linux-rp_2.6.21.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r8" +PR = "r9" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -49,6 +49,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ file://pxa-serial-hack.patch;patch=1;status=hack \ file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \ + file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \ file://squashfs3.0-2.6.15.patch;patch=1;status=external \ file://vesafb-tng-1.0-rc2-2.6.20-rc2.patch;patch=1;status=external \ file://sharpsl-rc-r1.patch;patch=1 \ |