diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-04-14 10:18:59 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-14 10:18:59 +0000 |
| commit | db96eaf0375c0458ff4d56f24a73d5ce8067940e (patch) | |
| tree | 4d210f37ce64910fa13ad18b3af4db61267ea56f /packages/linux | |
| parent | ea0453416e73df34755112cffe35741ef9a65d2e (diff) | |
| parent | 477049f7d437e102149d35e8e6bd1a14181dd5e7 (diff) | |
merge of db90e0deb7a031c29d263ee783179a2f9a00c649
and a07719feb319fd43615902b86aa7a10c6b61d0ba
Diffstat (limited to 'packages/linux')
| -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 31c5f04ebe..1dd8e0eb61 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 @@ -24,7 +24,7 @@ +static struct sockaddr mac; + +static void nslu2_flash_add(struct mtd_info *mtd) { -+ if (strcmp(mtd->name, "RedBoot config") == 0) { ++ if (strcmp(mtd->name, "RedBoot") == 0) { + size_t retlen; + int err; + /* the mac addr is at a known offset */ diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb index 66d1c38e42..854b86d047 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 = "r3.${PR_CONFIG}" +PR = "r4.${PR_CONFIG}" include ixp4xx-kernel.inc |