[kernel] r22459 - in dists/sid/linux/debian: . config/armel

[Ben Hutchings]

Author: benh
Date: Thu Mar 26 20:05:20 2015
New Revision: 22459

Log:
flash-kernel is not the same thing as kernel-wedge

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/armel/defines

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Thu Mar 26 00:37:08 2015	(r22458)
+++ dists/sid/linux/debian/changelog	Thu Mar 26 20:05:20 2015	(r22459)
@@ -7,7 +7,7 @@
     disabled (Closes: #780858)
 
   [ Ben Hutchings ]
-  * [armel/kirkwood] linux-image: Add versioned Breaks against kernel-wedge,
+  * [armel/kirkwood] linux-image: Add versioned Breaks against flash-kernel,
     to ensure that an FDT is appended to the image if needed (Closes: #781193)
 
  -- Ian Campbell <ijc at debian.org>  Wed, 18 Mar 2015 21:07:15 +0000

Modified: dists/sid/linux/debian/config/armel/defines
==============================================================================
--- dists/sid/linux/debian/config/armel/defines	Thu Mar 26 00:37:08 2015	(r22458)
+++ dists/sid/linux/debian/config/armel/defines	Thu Mar 26 20:05:20 2015	(r22459)
@@ -99,8 +99,8 @@
 # SheevaPlug: 4194304 - 8 - 64 = 4194232
 # QNAP TS-119/TS-219: 2097152 - 8 - 64 = 2097080
 check-size: 2097080
-# Most machines require appended FDT, which was completed in kernel-wedge 3.14
-breaks: kernel-wedge (<< 3.14~)
+# Most machines require appended FDT, which was completed in flash-kernel 3.14
+breaks: flash-kernel (<< 3.14~)
 
 [kirkwood_abi]
 ignore-changes: