From: Justin Patrin <papercrane@gmail.com>
Date: Thu, 19 Jan 2006 16:35:29 +0000 (+0000)
Subject: merge of 8fe9e84203f325715a995ee73f2ced825d331544
X-Git-Tag: Release-2010-05/1~9453^2~2608^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea99bc2a74329de257bd3471bd13f47b36ed861f;p=openembedded.git

merge of 8fe9e84203f325715a995ee73f2ced825d331544
     and 954aa96066fbf8f17149a585094fa9a4d3d94246
---

ea99bc2a74329de257bd3471bd13f47b36ed861f
diff --cc packages/linux/ixp4xx-kernel_2.6.15.1.bb
index 8e120fd0df,761b9c3203..b4cde1bf41
--- a/packages/linux/ixp4xx-kernel_2.6.15.1.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.15.1.bb
@@@ -8,7 -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 = "r0.${PR_CONFIG}"
 -PR = "r9.${PR_CONFIG}"
++PR = "r8.${PR_CONFIG}"
  
  include ixp4xx-kernel.inc
  
@@@ -21,7 -21,7 +21,6 @@@ IXP4XX_PATCHES += "file://11-mtdpart-re
  IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1"
  IXP4XX_PATCHES += "file://40-rtc-class.patch;patch=1"
  IXP4XX_PATCHES += "file://45-eeprom-notifier.patch;patch=1"
--IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1"
  IXP4XX_PATCHES += "file://50-nas100d-arch.patch;patch=1"
  IXP4XX_PATCHES += "file://55-rtc-pcf8563.patch;patch=1"
  IXP4XX_PATCHES += "file://60-nas100d-i2c.patch;patch=1"
@@@ -38,5 -38,5 +37,6 @@@ IXP4XX_PATCHES += "file://91-maclist.pa
  IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1"
  IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1"
  IXP4XX_PATCHES += "file://93-loft-maclist.patch;patch=1"
++IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1"
  IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1"
  IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1"