[kernel] r7384 - in dists/trunk/linux-2.6/debian: . arch/arm

[Martin Michlmayr]

Author: tbm
Date: Mon Sep 11 11:27:32 2006
New Revision: 7384

Removed:
   dists/trunk/linux-2.6/debian/arch/arm/config.nslu2
Modified:
   dists/trunk/linux-2.6/debian/arch/arm/defines
   dists/trunk/linux-2.6/debian/changelog

Log:
arm/nslu2: Drop flavour since this machine is supported by arm/ixp4xx.


Modified: dists/trunk/linux-2.6/debian/arch/arm/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/defines	Mon Sep 11 11:27:32 2006
@@ -3,7 +3,6 @@
  footbridge
  iop32x
  ixp4xx
- nslu2
  rpc
  s3c2410
 kernel-arch: arm
@@ -25,11 +24,7 @@
 
 [ixp4xx]
 class: IXP4xx
-longclass: IXP4xx based
-
-[nslu2]
-class: NSLU2
-longclass: Linksys NSLU2 (Network Storage Link for USB 2.0 Disk Drives)
+longclass: IXP4xx based (Linksys NSLU2, etc)
 
 [rpc]
 class: RiscPC

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Sep 11 11:27:32 2006
@@ -7,6 +7,7 @@
   * mipsel/r5k-cobalt: Enable ISDN.
   * arm/iop32x: Fix iop321 cpuid.
   * arm/footbridge: Enable the CIFS module (closes: #274808).
+  * arm/nslu2: Drop flavour since this machine is supported by arm/ixp4xx.
 
   [ Sven Luther ]
   * [powerpc] Enabled the -prep flavour.