diff -u module-init-tools-3.12/debian/changelog module-init-tools-3.12/debian/changelog
--- module-init-tools-3.12/debian/changelog
+++ module-init-tools-3.12/debian/changelog
@@ -1,3 +1,16 @@
+module-init-tools (3.12-1ubuntu5) natty; urgency=low
+
+  * Added intel-3945-iwlagn-disable11n.conf
+    The iwlwifi driver is now split into legacy 3945 and
+    everything else as of 2.6.38. Support for 4965 is still contained in the iwlagn
+    driver even though considered a legacy device. Intel affirms
+    802.11n should work. iwl3945 is no longer supported and will never
+    have a functional 802.11n mode.
+  * removed intel-5300-iwlagn-disable11n.conf
+    -LP: #630748
+
+ -- Tim Gardner <tim.gardner@canonical.com>  Fri, 25 Mar 2011 09:29:16 -0600
+
 module-init-tools (3.12-1ubuntu4) natty; urgency=low
 
   * debian/modprobe.d/blacklist-framebuffer.conf: re-enable vesafb so that
diff -u module-init-tools-3.12/debian/module-init-tools.preinst module-init-tools-3.12/debian/module-init-tools.preinst
--- module-init-tools-3.12/debian/module-init-tools.preinst
+++ module-init-tools-3.12/debian/module-init-tools.preinst
@@ -106,4 +106,7 @@
 esac
 
+# iwlwifi split into 2 drivers as of 2.6.38; iwl3945 and iwlagn
+dpkg-maintscript-helper rm_conffile /etc/modprobe.d/intel-5300-iwlagn-disable11n.conf 3.12-1ubuntu4 -- preinst $1
+
 #DEBHELPER#
 exit 0
diff -u module-init-tools-3.12/debian/control module-init-tools-3.12/debian/control
--- module-init-tools-3.12/debian/control
+++ module-init-tools-3.12/debian/control
@@ -8,6 +8,7 @@
 Package: module-init-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: dpkg (>= 1.15.7.2)
 Breaks: initramfs-tools (<< 0.92bubuntu23)
 Description: tools for managing Linux kernel modules
  This package contains a set of programs for loading, inserting, and 
diff -u module-init-tools-3.12/debian/module-init-tools.postrm module-init-tools-3.12/debian/module-init-tools.postrm
--- module-init-tools-3.12/debian/module-init-tools.postrm
+++ module-init-tools-3.12/debian/module-init-tools.postrm
@@ -182,4 +182,7 @@
 esac
 
+# iwlwifi split into 2 drivers as of 2.6.38; iwl3945 and iwlagn
+dpkg-maintscript-helper rm_conffile /etc/modprobe.d/intel-5300-iwlagn-disable11n.conf 3.12-1ubuntu4 -- postrm $1
+
 #DEBHELPER#
 exit 0
diff -u module-init-tools-3.12/debian/module-init-tools.postinst module-init-tools-3.12/debian/module-init-tools.postinst
--- module-init-tools-3.12/debian/module-init-tools.postinst
+++ module-init-tools-3.12/debian/module-init-tools.postinst
@@ -138,4 +138,7 @@
 esac
 
+# iwlwifi split into 2 drivers as of 2.6.38; iwl3945 and iwlagn
+dpkg-maintscript-helper rm_conffile /etc/modprobe.d/intel-5300-iwlagn-disable11n.conf 3.12-1ubuntu4 -- postinst $1
+
 #DEBHELPER#
 exit 0
reverted:
--- module-init-tools-3.12/debian/modprobe.d/intel-5300-iwlagn-disable11n.conf
+++ module-init-tools-3.12.orig/debian/modprobe.d/intel-5300-iwlagn-disable11n.conf
@@ -1 +0,0 @@
-options iwlagn 11n_disable=1
only in patch2:
unchanged:
--- module-init-tools-3.12.orig/debian/modprobe.d/intel-3945-iwlagn-disable11n.conf
+++ module-init-tools-3.12/debian/modprobe.d/intel-3945-iwlagn-disable11n.conf
@@ -0,0 +1 @@
+options iwl3945 11n_disable=1