update spl/zfs to 0.6.5.6

[pve-kernel-2.6.32.git] / control.firmware

diff --git a/control.firmware b/control.firmware
index 00b949cbe20882141d38cf268ccb32b6b43f7f21..1463d08427743fefac145e5852b1b27f53ea4b37 100644 (file)
--- a/control.firmware
+++ b/control.firmware
@@ -4,7 +4,8 @@ Section: misc
 Priority: optional
 Architecture: all
 Suggests: linux-image
-Conflicts: firmware-linux-free, firmware-linux-nonfree 
+Conflicts: firmware-linux-free, firmware-linux-nonfree, firmware-atheros, firmware-bnx2, firmware-bnx2x, firmware-intelwimax, firmware-ipw2x00, firmware-iwlwifi, firmware-netxen, firmware-qlogic, firmware-ralink, firmware-realtek, firmware-brcm80211, firmware-ivtv
+Replaces: firmware-linux-free, firmware-linux-nonfree, firmware-atheros, firmware-bnx2, firmware-bnx2x, firmware-intelwimax, firmware-ipw2x00, firmware-iwlwifi, firmware-netxen, firmware-qlogic, firmware-ralink, firmware-realtek, firmware-brcm80211, firmware-ivtv
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Description: Binary firmware code for the pve-kernel
  This package contains the binary firmware for various modules used in