X-Git-Url: http://git.maemo.org/git/?p=kernel-bfs;a=blobdiff_plain;f=kernel-bfs-2.6.28%2Fdebian%2Fcontrol;fp=kernel-bfs-2.6.28%2Fdebian%2Fcontrol;h=a1755a61a5dc374a0ebede66b12b97083093d202;hp=2402c0391940e44cb981576b011ecc53f756e666;hb=188dd2b8e7a3aee75942ec735f7ef5552b022c41;hpb=ccdee2c5e43bc2e619f873ffb8ace2fd68ec4cca

diff --git a/kernel-bfs-2.6.28/debian/control b/kernel-bfs-2.6.28/debian/control
index 2402c03..a1755a6 100644
--- a/kernel-bfs-2.6.28/debian/control
+++ b/kernel-bfs-2.6.28/debian/control
@@ -104,7 +104,7 @@ Section: user/system
 Architecture: armel
 Pre-Depends: kernel-bfs (= ${binary:Version}), kernel-bfs-modules (= ${binary:Version}), softupd (>= 0.4.0), maemo-installer-utils
 Depends: sudo
-Conflicts: kernel-flasher-maemo (<= 2.6.28-maemo22), kernel-maemo, kernel-modules-maemo, kernel-headers-maemo, linux-kernel-headers-maemo
+Conflicts: kernel-flasher-maemo (<= 2.6.28-maemo22), kernel-maemo, kernel-modules-maemo, kernel-headers-maemo, linux-kernel-headers-maemo, kernel-power-flasher
 Recommends: kernel-power-settings, usbip, iptables, mtd-utils, kexec-tools
 Provides: kernel-feature-netfilter, kernel-feature-ipv6, kernel-feature-ext4, kernel-feature-xfs, kernel-feature-reiserfs,
   kernel-feature-ntfs-read, kernel-feature-udf, kernel-feature-cifs, kernel-feature-automounter, kernel-feature-squashfs,