diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-04-14 10:59:48 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-14 10:59:48 +0000 |
| commit | 4e1d8353b3caf7603b725f697cbd375ba51f583a (patch) | |
| tree | 20730cc9fe071bab560f7210ead6fb949a570de4 | |
| parent | ba4813236cfa8e229ddae4af68bb12b7ef9c9822 (diff) | |
| parent | 266a5116fd8b594fbd10ee97fb4b1ee5051f7b4c (diff) | |
merge of 10fda4dfb0a2f5767e4a9d988a15ebb4f4cbf79c
and c49f43315981d8fb19ca487c3def795abc8299cf
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.16.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch b/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch index 1dd8e0eb61..d1e84e222c 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch @@ -28,7 +28,7 @@ + size_t retlen; + int err; + /* the mac addr is at a known offset */ -+ err = mtd->read(mtd, 0x3FFD8, 6, &retlen, (u8 *) &mac.sa_data); ++ err = mtd->read(mtd, 0x3FFB0, 6, &retlen, (u8 *) &mac.sa_data); + if (err != 0 || retlen != 6) + printk(KERN_ERR "nslu2: mac addr read failed\n"); + else diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb index 854b86d047..0b00414577 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16.bb @@ -8,7 +8,7 @@ PR_CONFIG = "1" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r4.${PR_CONFIG}" +PR = "r5.${PR_CONFIG}" include ixp4xx-kernel.inc |