diff --git a/[refs] b/[refs]
index 17dc0671c90d..f977ce9d30dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6b7a407865aab9f849dd99a71072b7cd1175116
+refs/heads/master: 44d856665789288859b7aa47ca25933c1c6ab57d
diff --git a/trunk/drivers/atm/eni.h b/trunk/drivers/atm/eni.h
index 493a6932507e..e4c9525e60b3 100644
--- a/trunk/drivers/atm/eni.h
+++ b/trunk/drivers/atm/eni.h
@@ -8,7 +8,6 @@
 
 #include <linux/atm.h>
 #include <linux/atmdev.h>
-#include <linux/interrupt.h>
 #include <linux/sonet.h>
 #include <linux/skbuff.h>
 #include <linux/time.h>
diff --git a/trunk/drivers/atm/firestream.c b/trunk/drivers/atm/firestream.c
index 7c7b571647f9..ef7a658312a6 100644
--- a/trunk/drivers/atm/firestream.c
+++ b/trunk/drivers/atm/firestream.c
@@ -44,7 +44,6 @@
 #include <linux/ioport.h> /* for request_region */
 #include <linux/uio.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/capability.h>
 #include <linux/bitops.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/atm/horizon.c b/trunk/drivers/atm/horizon.c
index 287506183893..d58e3fcb9db3 100644
--- a/trunk/drivers/atm/horizon.c
+++ b/trunk/drivers/atm/horizon.c
@@ -38,7 +38,6 @@
 #include <linux/delay.h>
 #include <linux/uio.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/atm/idt77252.c b/trunk/drivers/atm/idt77252.c
index be0dbfeb541c..1f8d724a18bf 100644
--- a/trunk/drivers/atm/idt77252.c
+++ b/trunk/drivers/atm/idt77252.c
@@ -37,7 +37,6 @@
 #include <linux/atm.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/wait.h>
 #include <linux/jiffies.h>
diff --git a/trunk/drivers/atm/iphase.c b/trunk/drivers/atm/iphase.c
index 957106f636ea..dee4f01a64d8 100644
--- a/trunk/drivers/atm/iphase.c
+++ b/trunk/drivers/atm/iphase.c
@@ -53,7 +53,6 @@
 #include <linux/delay.h>  
 #include <linux/uio.h>  
 #include <linux/init.h>  
-#include <linux/interrupt.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
 #include <asm/system.h>  
diff --git a/trunk/drivers/atm/zatm.c b/trunk/drivers/atm/zatm.c
index 7f8c5132ff32..624917902b65 100644
--- a/trunk/drivers/atm/zatm.c
+++ b/trunk/drivers/atm/zatm.c
@@ -16,7 +16,6 @@
 #include <linux/delay.h>
 #include <linux/uio.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
 #include <linux/atm_zatm.h>
 #include <linux/capability.h>
diff --git a/trunk/drivers/infiniband/hw/amso1100/c2.c b/trunk/drivers/infiniband/hw/amso1100/c2.c
index 444470a28de2..0cfc455630d0 100644
--- a/trunk/drivers/infiniband/hw/amso1100/c2.c
+++ b/trunk/drivers/infiniband/hw/amso1100/c2.c
@@ -36,7 +36,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/inetdevice.h>
-#include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
diff --git a/trunk/drivers/infiniband/ulp/iser/iscsi_iser.h b/trunk/drivers/infiniband/ulp/iser/iscsi_iser.h
index 342cbc1bdaae..2f02ab0ccc1e 100644
--- a/trunk/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/trunk/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -45,7 +45,6 @@
 #include <scsi/libiscsi.h>
 #include <scsi/scsi_transport_iscsi.h>
 
-#include <linux/interrupt.h>
 #include <linux/wait.h>
 #include <linux/sched.h>
 #include <linux/list.h>
diff --git a/trunk/drivers/isdn/hardware/mISDN/avmfritz.c b/trunk/drivers/isdn/hardware/mISDN/avmfritz.c
index 861b6511f3ee..472a2af79446 100644
--- a/trunk/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/trunk/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/isdn/hardware/mISDN/hfcmulti.c b/trunk/drivers/isdn/hardware/mISDN/hfcmulti.c
index a440d7fff0ad..f6f3c87cc7c2 100644
--- a/trunk/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/trunk/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -152,7 +152,6 @@
 
 #define HFC_MULTI_VERSION	"2.03"
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
diff --git a/trunk/drivers/isdn/hardware/mISDN/hfcpci.c b/trunk/drivers/isdn/hardware/mISDN/hfcpci.c
index 3261de18a91e..b01a7be1300f 100644
--- a/trunk/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/trunk/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -44,7 +44,6 @@
  *
  */
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/trunk/drivers/isdn/hardware/mISDN/mISDNinfineon.c
index 6218775ce87d..bc0529ac88a1 100644
--- a/trunk/drivers/isdn/hardware/mISDN/mISDNinfineon.c
+++ b/trunk/drivers/isdn/hardware/mISDN/mISDNinfineon.c
@@ -38,7 +38,6 @@
  *
  */
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/isdn/hardware/mISDN/mISDNipac.c b/trunk/drivers/isdn/hardware/mISDN/mISDNipac.c
index d2ffb1d9b831..64ecc6f5ffaf 100644
--- a/trunk/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/trunk/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include <linux/irqreturn.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mISDNhw.h>
diff --git a/trunk/drivers/isdn/hardware/mISDN/netjet.c b/trunk/drivers/isdn/hardware/mISDN/netjet.c
index 5ef9f11ee74b..db25b6b2ae39 100644
--- a/trunk/drivers/isdn/hardware/mISDN/netjet.c
+++ b/trunk/drivers/isdn/hardware/mISDN/netjet.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/isdn/hardware/mISDN/speedfax.c b/trunk/drivers/isdn/hardware/mISDN/speedfax.c
index 4d0d41ea1228..9e07246bb9e7 100644
--- a/trunk/drivers/isdn/hardware/mISDN/speedfax.c
+++ b/trunk/drivers/isdn/hardware/mISDN/speedfax.c
@@ -22,7 +22,6 @@
  *
  */
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
diff --git a/trunk/drivers/isdn/hardware/mISDN/w6692.c b/trunk/drivers/isdn/hardware/mISDN/w6692.c
index e10e0284533c..9e84870b971c 100644
--- a/trunk/drivers/isdn/hardware/mISDN/w6692.c
+++ b/trunk/drivers/isdn/hardware/mISDN/w6692.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/isdn/hisax/hisax.h b/trunk/drivers/isdn/hisax/hisax.h
index 0a5c42a3f125..de1c669c7b13 100644
--- a/trunk/drivers/isdn/hisax/hisax.h
+++ b/trunk/drivers/isdn/hisax/hisax.h
@@ -16,7 +16,6 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
-#include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
diff --git a/trunk/drivers/isdn/hisax/hisax_fcpcipnp.c b/trunk/drivers/isdn/hisax/hisax_fcpcipnp.c
index 478ebab54ca4..8b0a7d86b30f 100644
--- a/trunk/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/trunk/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -25,7 +25,6 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/isapnp.h>
 #include <linux/kmod.h>
diff --git a/trunk/drivers/media/dvb/b2c2/flexcop-common.h b/trunk/drivers/media/dvb/b2c2/flexcop-common.h
index 437912e49824..9e2148a19967 100644
--- a/trunk/drivers/media/dvb/b2c2/flexcop-common.h
+++ b/trunk/drivers/media/dvb/b2c2/flexcop-common.h
@@ -6,7 +6,6 @@
 #ifndef __FLEXCOP_COMMON_H__
 #define __FLEXCOP_COMMON_H__
 
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/mutex.h>
 
diff --git a/trunk/drivers/media/dvb/dm1105/dm1105.c b/trunk/drivers/media/dvb/dm1105/dm1105.c
index 55e6533f15e9..b2b0c45f32a9 100644
--- a/trunk/drivers/media/dvb/dm1105/dm1105.c
+++ b/trunk/drivers/media/dvb/dm1105/dm1105.c
@@ -22,7 +22,6 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
diff --git a/trunk/drivers/media/dvb/mantis/mantis_common.h b/trunk/drivers/media/dvb/mantis/mantis_common.h
index 49dbca145bb8..bd400d21b81f 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_common.h
+++ b/trunk/drivers/media/dvb/mantis/mantis_common.h
@@ -21,7 +21,6 @@
 #ifndef __MANTIS_COMMON_H
 #define __MANTIS_COMMON_H
 
-#include <linux/interrupt.h>
 #include <linux/mutex.h>
 #include <linux/workqueue.h>
 
diff --git a/trunk/drivers/media/dvb/pluto2/pluto2.c b/trunk/drivers/media/dvb/pluto2/pluto2.c
index 80fb51004461..7cb79ec685f0 100644
--- a/trunk/drivers/media/dvb/pluto2/pluto2.c
+++ b/trunk/drivers/media/dvb/pluto2/pluto2.c
@@ -26,7 +26,6 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/trunk/drivers/net/3c503.c b/trunk/drivers/net/3c503.c
index 554a26c55188..d84f6e8903a5 100644
--- a/trunk/drivers/net/3c503.c
+++ b/trunk/drivers/net/3c503.c
@@ -49,7 +49,6 @@ static const char version[] =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/ethtool.h>
 
 #include <asm/uaccess.h>
diff --git a/trunk/drivers/net/8139cp.c b/trunk/drivers/net/8139cp.c
index 73b10b07f9b5..10c45051caea 100644
--- a/trunk/drivers/net/8139cp.c
+++ b/trunk/drivers/net/8139cp.c
@@ -60,7 +60,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/net/8139too.c b/trunk/drivers/net/8139too.c
index ed6355cc5261..98517a373473 100644
--- a/trunk/drivers/net/8139too.c
+++ b/trunk/drivers/net/8139too.c
@@ -100,7 +100,6 @@
 #include <linux/compiler.h>
 #include <linux/pci.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
diff --git a/trunk/drivers/net/8390.h b/trunk/drivers/net/8390.h
index 58a12e4c78f9..3d9e8fb4fbee 100644
--- a/trunk/drivers/net/8390.h
+++ b/trunk/drivers/net/8390.h
@@ -9,7 +9,6 @@
 
 #include <linux/if_ether.h>
 #include <linux/ioport.h>
-#include <linux/irqreturn.h>
 #include <linux/skbuff.h>
 
 #define TX_PAGES 12	/* Two Tx slots */
diff --git a/trunk/drivers/net/ac3200.c b/trunk/drivers/net/ac3200.c
index f07b2e980fbc..5181e9322119 100644
--- a/trunk/drivers/net/ac3200.c
+++ b/trunk/drivers/net/ac3200.c
@@ -32,7 +32,6 @@ static const char version[] =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
diff --git a/trunk/drivers/net/acenic.h b/trunk/drivers/net/acenic.h
index fd25a3b47fef..0681da7e8753 100644
--- a/trunk/drivers/net/acenic.h
+++ b/trunk/drivers/net/acenic.h
@@ -1,6 +1,5 @@
 #ifndef _ACENIC_H_
 #define _ACENIC_H_
-#include <linux/interrupt.h>
 
 
 /*
diff --git a/trunk/drivers/net/amd8111e.c b/trunk/drivers/net/amd8111e.c
index db6d2da5a8f3..81475ea3a711 100644
--- a/trunk/drivers/net/amd8111e.c
+++ b/trunk/drivers/net/amd8111e.c
@@ -75,7 +75,6 @@ Revision History:
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/netdevice.h>
diff --git a/trunk/drivers/net/arcnet/arc-rimi.c b/trunk/drivers/net/arcnet/arc-rimi.c
index 25197b698dd6..9efbbbae47ca 100644
--- a/trunk/drivers/net/arcnet/arc-rimi.c
+++ b/trunk/drivers/net/arcnet/arc-rimi.c
@@ -32,7 +32,6 @@
 #include <linux/netdevice.h>
 #include <linux/bootmem.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <asm/io.h>
 #include <linux/arcdevice.h>
 
diff --git a/trunk/drivers/net/arcnet/com20020-isa.c b/trunk/drivers/net/arcnet/com20020-isa.c
index 45c61a2c5fbd..37272827ee55 100644
--- a/trunk/drivers/net/arcnet/com20020-isa.c
+++ b/trunk/drivers/net/arcnet/com20020-isa.c
@@ -34,7 +34,6 @@
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/bootmem.h>
 #include <linux/arcdevice.h>
 #include <linux/com20020.h>
diff --git a/trunk/drivers/net/arcnet/com20020-pci.c b/trunk/drivers/net/arcnet/com20020-pci.c
index d427493997b6..48a1dbf01e60 100644
--- a/trunk/drivers/net/arcnet/com20020-pci.c
+++ b/trunk/drivers/net/arcnet/com20020-pci.c
@@ -34,7 +34,6 @@
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/arcdevice.h>
 #include <linux/com20020.h>
diff --git a/trunk/drivers/net/arcnet/com20020.c b/trunk/drivers/net/arcnet/com20020.c
index 7bfb91f32857..c9e459400ff9 100644
--- a/trunk/drivers/net/arcnet/com20020.c
+++ b/trunk/drivers/net/arcnet/com20020.c
@@ -33,7 +33,6 @@
 #include <linux/delay.h>
 #include <linux/netdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/arcdevice.h>
 #include <linux/com20020.h>
 
diff --git a/trunk/drivers/net/arcnet/com90io.c b/trunk/drivers/net/arcnet/com90io.c
index 487d780ebbdf..eb27976dab37 100644
--- a/trunk/drivers/net/arcnet/com90io.c
+++ b/trunk/drivers/net/arcnet/com90io.c
@@ -33,7 +33,6 @@
 #include <linux/netdevice.h>
 #include <linux/bootmem.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <asm/io.h>
 #include <linux/arcdevice.h>
 
diff --git a/trunk/drivers/net/arcnet/com90xx.c b/trunk/drivers/net/arcnet/com90xx.c
index b80fbe40aa0e..f3b46f71e293 100644
--- a/trunk/drivers/net/arcnet/com90xx.c
+++ b/trunk/drivers/net/arcnet/com90xx.c
@@ -27,7 +27,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/trunk/drivers/net/arm/at91_ether.c b/trunk/drivers/net/arm/at91_ether.c
index 29dc43523cec..e07b314ed8fd 100644
--- a/trunk/drivers/net/arm/at91_ether.c
+++ b/trunk/drivers/net/arm/at91_ether.c
@@ -19,7 +19,6 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/mii.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/trunk/drivers/net/arm/ep93xx_eth.c b/trunk/drivers/net/arm/ep93xx_eth.c
index a167addd5382..5a77001b6d10 100644
--- a/trunk/drivers/net/arm/ep93xx_eth.c
+++ b/trunk/drivers/net/arm/ep93xx_eth.c
@@ -19,7 +19,6 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/net/arm/ks8695net.c b/trunk/drivers/net/arm/ks8695net.c
index bb62b3f51837..a7b0caa18179 100644
--- a/trunk/drivers/net/arm/ks8695net.c
+++ b/trunk/drivers/net/arm/ks8695net.c
@@ -21,7 +21,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/crc32.h>
diff --git a/trunk/drivers/net/atl1c/atl1c.h b/trunk/drivers/net/atl1c/atl1c.h
index dfe4370ccc90..925929d764ca 100644
--- a/trunk/drivers/net/atl1c/atl1c.h
+++ b/trunk/drivers/net/atl1c/atl1c.h
@@ -24,7 +24,6 @@
 
 #include <linux/version.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/module.h>
diff --git a/trunk/drivers/net/atl1e/atl1e.h b/trunk/drivers/net/atl1e/atl1e.h
index 9ac37e3ec8fb..490d3b38e0cb 100644
--- a/trunk/drivers/net/atl1e/atl1e.h
+++ b/trunk/drivers/net/atl1e/atl1e.h
@@ -25,7 +25,6 @@
 
 #include <linux/version.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/module.h>
diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c
index 085560e1d17a..a69331e06b8d 100644
--- a/trunk/drivers/net/b44.c
+++ b/trunk/drivers/net/b44.c
@@ -25,7 +25,6 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
 #include <linux/ssb/ssb.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c
index 9ba197b09788..5824c95c7843 100644
--- a/trunk/drivers/net/benet/be_main.c
+++ b/trunk/drivers/net/benet/be_main.c
@@ -362,8 +362,8 @@ static void populate_lancer_stats(struct be_adapter *adapter)
 	drvs->rx_priority_pause_frames = 0;
 	drvs->pmem_fifo_overflow_drop = 0;
 	drvs->rx_pause_frames =
-		make_64bit_val(pport_stats->rx_pause_frames_hi,
-				 pport_stats->rx_pause_frames_lo);
+		make_64bit_val(pport_stats->rx_pause_frames_lo,
+				 pport_stats->rx_pause_frames_hi);
 	drvs->rx_crc_errors = make_64bit_val(pport_stats->rx_crc_errors_hi,
 						pport_stats->rx_crc_errors_lo);
 	drvs->rx_control_frames =
diff --git a/trunk/drivers/net/bmac.c b/trunk/drivers/net/bmac.c
index d2e58e2bea78..a1b8c8b8010b 100644
--- a/trunk/drivers/net/bmac.c
+++ b/trunk/drivers/net/bmac.c
@@ -7,7 +7,6 @@
  * May 1999, Al Viro: proper release of /proc/net/bmac entry, switched to
  * dynamic procfs inode.
  */
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
diff --git a/trunk/drivers/net/bnx2x/bnx2x_cmn.c b/trunk/drivers/net/bnx2x/bnx2x_cmn.c
index 831c6ec98eed..9b248348c0e6 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/trunk/drivers/net/bnx2x/bnx2x_cmn.c
@@ -17,7 +17,6 @@
 
 #include <linux/etherdevice.h>
 #include <linux/if_vlan.h>
-#include <linux/interrupt.h>
 #include <linux/ip.h>
 #include <net/ipv6.h>
 #include <net/ip6_checksum.h>
diff --git a/trunk/drivers/net/caif/caif_serial.c b/trunk/drivers/net/caif/caif_serial.c
index 1cd0b59d13cb..3df0c0f8b8bf 100644
--- a/trunk/drivers/net/caif/caif_serial.c
+++ b/trunk/drivers/net/caif/caif_serial.c
@@ -4,7 +4,6 @@
  * License terms: GNU General Public License (GPL) version 2
  */
 
-#include <linux/hardirq.h>
 #include <linux/init.h>
 #include <linux/version.h>
 #include <linux/module.h>
diff --git a/trunk/drivers/net/can/at91_can.c b/trunk/drivers/net/can/at91_can.c
index 74efb5a2ad41..8f15ae4c719f 100644
--- a/trunk/drivers/net/can/at91_can.c
+++ b/trunk/drivers/net/can/at91_can.c
@@ -157,21 +157,21 @@ enum at91_mb_mode {
 #define AT91_IRQ_ALL		(0x1fffffff)
 
 struct at91_priv {
-	struct can_priv		can;	   /* must be the first member! */
-	struct net_device	*dev;
-	struct napi_struct	napi;
+	struct can_priv can;		/* must be the first member! */
+	struct net_device *dev;
+	struct napi_struct napi;
 
-	void __iomem		*reg_base;
+	void __iomem *reg_base;
 
-	u32			reg_sr;
-	unsigned int		tx_next;
-	unsigned int		tx_echo;
-	unsigned int		rx_next;
+	u32 reg_sr;
+	unsigned int tx_next;
+	unsigned int tx_echo;
+	unsigned int rx_next;
 
-	struct clk		*clk;
-	struct at91_can_data	*pdata;
+	struct clk *clk;
+	struct at91_can_data *pdata;
 
-	canid_t			mb0_id;
+	canid_t mb0_id;
 };
 
 static struct can_bittiming_const at91_bittiming_const = {
@@ -271,7 +271,7 @@ static void at91_setup_mailboxes(struct net_device *dev)
 
 	/* reset acceptance mask and id register */
 	for (i = AT91_MB_RX_FIRST; i <= AT91_MB_RX_LAST; i++) {
-		at91_write(priv, AT91_MAM(i), 0x0 );
+		at91_write(priv, AT91_MAM(i), 0x0);
 		at91_write(priv, AT91_MID(i), AT91_MID_MIDE);
 	}
 
@@ -1231,11 +1231,11 @@ static int __devexit at91_can_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver at91_can_driver = {
-	.probe		= at91_can_probe,
-	.remove		= __devexit_p(at91_can_remove),
-	.driver		= {
-		.name	= KBUILD_MODNAME,
-		.owner	= THIS_MODULE,
+	.probe = at91_can_probe,
+	.remove = __devexit_p(at91_can_remove),
+	.driver = {
+		.name = KBUILD_MODNAME,
+		.owner = THIS_MODULE,
 	},
 };
 
diff --git a/trunk/drivers/net/can/sja1000/sja1000.h b/trunk/drivers/net/can/sja1000/sja1000.h
index 78bd4ecac140..de8e778f6832 100644
--- a/trunk/drivers/net/can/sja1000/sja1000.h
+++ b/trunk/drivers/net/can/sja1000/sja1000.h
@@ -47,7 +47,6 @@
 #ifndef SJA1000_DEV_H
 #define SJA1000_DEV_H
 
-#include <linux/irqreturn.h>
 #include <linux/can/dev.h>
 #include <linux/can/platform/sja1000.h>
 
diff --git a/trunk/drivers/net/cassini.c b/trunk/drivers/net/cassini.c
index b414f5ae0da5..22ce03e55b83 100644
--- a/trunk/drivers/net/cassini.c
+++ b/trunk/drivers/net/cassini.c
@@ -75,7 +75,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/vmalloc.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
diff --git a/trunk/drivers/net/cxgb4vf/adapter.h b/trunk/drivers/net/cxgb4vf/adapter.h
index 6e9a8d9ef592..4fd821aadc8a 100644
--- a/trunk/drivers/net/cxgb4vf/adapter.h
+++ b/trunk/drivers/net/cxgb4vf/adapter.h
@@ -40,7 +40,6 @@
 #ifndef __CXGB4VF_ADAPTER_H__
 #define __CXGB4VF_ADAPTER_H__
 
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/skbuff.h>
diff --git a/trunk/drivers/net/dm9000.c b/trunk/drivers/net/dm9000.c
index 863e9c459e65..ee597e676ee5 100644
--- a/trunk/drivers/net/dm9000.c
+++ b/trunk/drivers/net/dm9000.c
@@ -24,7 +24,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/crc32.h>
diff --git a/trunk/drivers/net/dnet.c b/trunk/drivers/net/dnet.c
index b22691046678..8318ea06cb6d 100644
--- a/trunk/drivers/net/dnet.c
+++ b/trunk/drivers/net/dnet.c
@@ -16,7 +16,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/dma-mapping.h>
diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c
index c1352c60c299..e336c7937f05 100644
--- a/trunk/drivers/net/e100.c
+++ b/trunk/drivers/net/e100.c
@@ -149,8 +149,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/hardirq.h>
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
diff --git a/trunk/drivers/net/e1000e/ethtool.c b/trunk/drivers/net/e1000e/ethtool.c
index cb1a3623253e..859d0d3af6c9 100644
--- a/trunk/drivers/net/e1000e/ethtool.c
+++ b/trunk/drivers/net/e1000e/ethtool.c
@@ -28,7 +28,6 @@
 
 /* ethtool support for e1000 */
 
-#include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
 #include <linux/pci.h>
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
index 888bd9cc2710..3310c3d477d7 100644
--- a/trunk/drivers/net/e1000e/netdev.c
+++ b/trunk/drivers/net/e1000e/netdev.c
@@ -31,7 +31,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
diff --git a/trunk/drivers/net/e2100.c b/trunk/drivers/net/e2100.c
index d50a9998ae77..94ec973b2bdc 100644
--- a/trunk/drivers/net/e2100.c
+++ b/trunk/drivers/net/e2100.c
@@ -44,7 +44,6 @@ static const char version[] =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
diff --git a/trunk/drivers/net/enic/enic.h b/trunk/drivers/net/enic/enic.h
index e0d2ad181bb8..38b351c7b979 100644
--- a/trunk/drivers/net/enic/enic.h
+++ b/trunk/drivers/net/enic/enic.h
@@ -32,7 +32,7 @@
 
 #define DRV_NAME		"enic"
 #define DRV_DESCRIPTION		"Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION		"2.1.1.16"
+#define DRV_VERSION		"2.1.1.13"
 #define DRV_COPYRIGHT		"Copyright 2008-2011 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX		6
@@ -74,7 +74,6 @@ struct enic {
 	struct vnic_dev *vdev;
 	struct timer_list notify_timer;
 	struct work_struct reset;
-	struct work_struct change_mtu_work;
 	struct msix_entry msix_entry[ENIC_INTR_MAX];
 	struct enic_msix_entry msix[ENIC_INTR_MAX];
 	u32 msg_enable;
diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c
index 9600f435c0fb..5b087ebe632d 100644
--- a/trunk/drivers/net/enic/enic_main.c
+++ b/trunk/drivers/net/enic/enic_main.c
@@ -23,7 +23,6 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/workqueue.h>
 #include <linux/pci.h>
 #include <linux/netdevice.h>
@@ -424,18 +423,11 @@ static void enic_mtu_check(struct enic *enic)
 
 	if (mtu && mtu != enic->port_mtu) {
 		enic->port_mtu = mtu;
-		if (enic_is_dynamic(enic)) {
-			mtu = max_t(int, ENIC_MIN_MTU,
-				min_t(int, ENIC_MAX_MTU, mtu));
-			if (mtu != netdev->mtu)
-				schedule_work(&enic->change_mtu_work);
-		} else {
-			if (mtu < netdev->mtu)
-				netdev_warn(netdev,
-					"interface MTU (%d) set higher "
-					"than switch port MTU (%d)\n",
-					netdev->mtu, mtu);
-		}
+		if (mtu < netdev->mtu)
+			netdev_warn(netdev,
+				"interface MTU (%d) set higher "
+				"than switch port MTU (%d)\n",
+				netdev->mtu, mtu);
 	}
 }
 
@@ -1696,9 +1688,6 @@ static int enic_change_mtu(struct net_device *netdev, int new_mtu)
 	if (new_mtu < ENIC_MIN_MTU || new_mtu > ENIC_MAX_MTU)
 		return -EINVAL;
 
-	if (enic_is_dynamic(enic))
-		return -EOPNOTSUPP;
-
 	if (running)
 		enic_stop(netdev);
 
@@ -1715,55 +1704,6 @@ static int enic_change_mtu(struct net_device *netdev, int new_mtu)
 	return 0;
 }
 
-static void enic_change_mtu_work(struct work_struct *work)
-{
-	struct enic *enic = container_of(work, struct enic, change_mtu_work);
-	struct net_device *netdev = enic->netdev;
-	int new_mtu = vnic_dev_mtu(enic->vdev);
-	int err;
-	unsigned int i;
-
-	new_mtu = max_t(int, ENIC_MIN_MTU, min_t(int, ENIC_MAX_MTU, new_mtu));
-
-	rtnl_lock();
-
-	/* Stop RQ */
-	del_timer_sync(&enic->notify_timer);
-
-	for (i = 0; i < enic->rq_count; i++)
-		napi_disable(&enic->napi[i]);
-
-	vnic_intr_mask(&enic->intr[0]);
-	enic_synchronize_irqs(enic);
-	err = vnic_rq_disable(&enic->rq[0]);
-	if (err) {
-		netdev_err(netdev, "Unable to disable RQ.\n");
-		return;
-	}
-	vnic_rq_clean(&enic->rq[0], enic_free_rq_buf);
-	vnic_cq_clean(&enic->cq[0]);
-	vnic_intr_clean(&enic->intr[0]);
-
-	/* Fill RQ with new_mtu-sized buffers */
-	netdev->mtu = new_mtu;
-	vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
-	/* Need at least one buffer on ring to get going */
-	if (vnic_rq_desc_used(&enic->rq[0]) == 0) {
-		netdev_err(netdev, "Unable to alloc receive buffers.\n");
-		return;
-	}
-
-	/* Start RQ */
-	vnic_rq_enable(&enic->rq[0]);
-	napi_enable(&enic->napi[0]);
-	vnic_intr_unmask(&enic->intr[0]);
-	enic_notify_timer_start(enic);
-
-	rtnl_unlock();
-
-	netdev_info(netdev, "interface MTU set as %d\n", netdev->mtu);
-}
-
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void enic_poll_controller(struct net_device *netdev)
 {
@@ -2405,7 +2345,6 @@ static int __devinit enic_probe(struct pci_dev *pdev,
 	enic->notify_timer.data = (unsigned long)enic;
 
 	INIT_WORK(&enic->reset, enic_reset);
-	INIT_WORK(&enic->change_mtu_work, enic_change_mtu_work);
 
 	for (i = 0; i < enic->wq_count; i++)
 		spin_lock_init(&enic->wq_lock[i]);
@@ -2488,7 +2427,6 @@ static void __devexit enic_remove(struct pci_dev *pdev)
 		struct enic *enic = netdev_priv(netdev);
 
 		cancel_work_sync(&enic->reset);
-		cancel_work_sync(&enic->change_mtu_work);
 		unregister_netdev(netdev);
 		enic_dev_deinit(enic);
 		vnic_dev_close(enic->vdev);
diff --git a/trunk/drivers/net/es3210.c b/trunk/drivers/net/es3210.c
index 7a09575ecff0..0ba5e7b90584 100644
--- a/trunk/drivers/net/es3210.c
+++ b/trunk/drivers/net/es3210.c
@@ -54,7 +54,6 @@ static const char version[] =
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 
diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c
index 9162c705c4fa..a83dd312c3ac 100644
--- a/trunk/drivers/net/ethoc.c
+++ b/trunk/drivers/net/ethoc.c
@@ -13,7 +13,6 @@
 
 #include <linux/etherdevice.h>
 #include <linux/crc32.h>
-#include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mii.h>
 #include <linux/phy.h>
diff --git a/trunk/drivers/net/fec_mpc52xx.c b/trunk/drivers/net/fec_mpc52xx.c
index eba0f696a51f..9f81b1ac130e 100644
--- a/trunk/drivers/net/fec_mpc52xx.c
+++ b/trunk/drivers/net/fec_mpc52xx.c
@@ -22,7 +22,6 @@
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/crc32.h>
 #include <linux/hardirq.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/net/greth.c b/trunk/drivers/net/greth.c
index 69b86d7fac85..f181304a7ab6 100644
--- a/trunk/drivers/net/greth.c
+++ b/trunk/drivers/net/greth.c
@@ -25,7 +25,6 @@
 #include <linux/module.h>
 #include <linux/uaccess.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
diff --git a/trunk/drivers/net/hamradio/baycom_ser_fdx.c b/trunk/drivers/net/hamradio/baycom_ser_fdx.c
index a974727dd9a2..99cdce33df8b 100644
--- a/trunk/drivers/net/hamradio/baycom_ser_fdx.c
+++ b/trunk/drivers/net/hamradio/baycom_ser_fdx.c
@@ -76,7 +76,6 @@
 #include <linux/ioport.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/hdlcdrv.h>
 #include <linux/baycom.h>
 #include <linux/jiffies.h>
diff --git a/trunk/drivers/net/hamradio/baycom_ser_hdx.c b/trunk/drivers/net/hamradio/baycom_ser_hdx.c
index e349d867449b..d92fe6ca788f 100644
--- a/trunk/drivers/net/hamradio/baycom_ser_hdx.c
+++ b/trunk/drivers/net/hamradio/baycom_ser_hdx.c
@@ -66,7 +66,6 @@
 #include <linux/ioport.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/hdlcdrv.h>
diff --git a/trunk/drivers/net/hp-plus.c b/trunk/drivers/net/hp-plus.c
index 29917363ebfb..82bffc3cabdf 100644
--- a/trunk/drivers/net/hp-plus.c
+++ b/trunk/drivers/net/hp-plus.c
@@ -30,7 +30,6 @@ static const char version[] =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/delay.h>
 
 #include <asm/system.h>
diff --git a/trunk/drivers/net/hp.c b/trunk/drivers/net/hp.c
index 18564d4a7c04..ef2014375e62 100644
--- a/trunk/drivers/net/hp.c
+++ b/trunk/drivers/net/hp.c
@@ -30,7 +30,6 @@ static const char version[] =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/delay.h>
 
 #include <asm/system.h>
diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c
index 838c5b673767..b388d782c7c4 100644
--- a/trunk/drivers/net/ibmveth.c
+++ b/trunk/drivers/net/ibmveth.c
@@ -34,7 +34,6 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/mm.h>
 #include <linux/pm.h>
 #include <linux/ethtool.h>
diff --git a/trunk/drivers/net/ifb.c b/trunk/drivers/net/ifb.c
index ce53f4a23b19..4fecaed67fc4 100644
--- a/trunk/drivers/net/ifb.c
+++ b/trunk/drivers/net/ifb.c
@@ -32,7 +32,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/moduleparam.h>
 #include <net/pkt_sched.h>
 #include <net/net_namespace.h>
diff --git a/trunk/drivers/net/ipg.c b/trunk/drivers/net/ipg.c
index d4aa40adf1e9..58cd3202b48c 100644
--- a/trunk/drivers/net/ipg.c
+++ b/trunk/drivers/net/ipg.c
@@ -22,7 +22,6 @@
  */
 #include <linux/crc32.h>
 #include <linux/ethtool.h>
-#include <linux/interrupt.h>
 #include <linux/gfp.h>
 #include <linux/mii.h>
 #include <linux/mutex.h>
diff --git a/trunk/drivers/net/irda/ali-ircc.c b/trunk/drivers/net/irda/ali-ircc.c
index 963067d3bda2..d532dde5120f 100644
--- a/trunk/drivers/net/irda/ali-ircc.c
+++ b/trunk/drivers/net/irda/ali-ircc.c
@@ -31,7 +31,6 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/rtnetlink.h>
 #include <linux/serial_reg.h>
 #include <linux/dma-mapping.h>
diff --git a/trunk/drivers/net/irda/donauboe.c b/trunk/drivers/net/irda/donauboe.c
index b45b2cc42804..174cafad2c1a 100644
--- a/trunk/drivers/net/irda/donauboe.c
+++ b/trunk/drivers/net/irda/donauboe.c
@@ -152,7 +152,6 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/rtnetlink.h>
 
diff --git a/trunk/drivers/net/irda/nsc-ircc.c b/trunk/drivers/net/irda/nsc-ircc.c
index b56636da6cc3..7a963d4e6d06 100644
--- a/trunk/drivers/net/irda/nsc-ircc.c
+++ b/trunk/drivers/net/irda/nsc-ircc.c
@@ -52,7 +52,6 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/rtnetlink.h>
 #include <linux/dma-mapping.h>
 #include <linux/pnp.h>
diff --git a/trunk/drivers/net/irda/pxaficp_ir.c b/trunk/drivers/net/irda/pxaficp_ir.c
index b1d1ce3dd8b5..001ed0a255f6 100644
--- a/trunk/drivers/net/irda/pxaficp_ir.c
+++ b/trunk/drivers/net/irda/pxaficp_ir.c
@@ -12,7 +12,6 @@
  * Infra-red driver (SIR/FIR) for the PXA2xx embedded microprocessor
  *
  */
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/trunk/drivers/net/irda/sir_dev.c b/trunk/drivers/net/irda/sir_dev.c
index 5039f08f5a5b..efe05bb34dd8 100644
--- a/trunk/drivers/net/irda/sir_dev.c
+++ b/trunk/drivers/net/irda/sir_dev.c
@@ -11,7 +11,6 @@
  *
  ********************************************************************/    
 
-#include <linux/hardirq.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/net/irda/smsc-ircc2.c b/trunk/drivers/net/irda/smsc-ircc2.c
index d5072af81b2d..8800e1fe4129 100644
--- a/trunk/drivers/net/irda/smsc-ircc2.c
+++ b/trunk/drivers/net/irda/smsc-ircc2.c
@@ -49,7 +49,6 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/rtnetlink.h>
 #include <linux/serial_reg.h>
 #include <linux/dma-mapping.h>
diff --git a/trunk/drivers/net/irda/via-ircc.c b/trunk/drivers/net/irda/via-ircc.c
index 6d6479049aa1..f504b262ba36 100644
--- a/trunk/drivers/net/irda/via-ircc.c
+++ b/trunk/drivers/net/irda/via-ircc.c
@@ -46,7 +46,6 @@ F02 Oct/28/02: Add SB device ID for 3147 and 3177.
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/rtnetlink.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
diff --git a/trunk/drivers/net/irda/vlsi_ir.c b/trunk/drivers/net/irda/vlsi_ir.c
index 9021d0131727..c3d07382b7fa 100644
--- a/trunk/drivers/net/irda/vlsi_ir.c
+++ b/trunk/drivers/net/irda/vlsi_ir.c
@@ -36,7 +36,6 @@ MODULE_LICENSE("GPL");
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/netdevice.h>
diff --git a/trunk/drivers/net/irda/w83977af_ir.c b/trunk/drivers/net/irda/w83977af_ir.c
index c4366601b067..1f9c3f08d1a3 100644
--- a/trunk/drivers/net/irda/w83977af_ir.c
+++ b/trunk/drivers/net/irda/w83977af_ir.c
@@ -47,7 +47,6 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/rtnetlink.h>
 #include <linux/dma-mapping.h>
 #include <linux/gfp.h>
diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
index 4950d03d3ef8..cb1555bc8548 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -27,7 +27,6 @@
 
 /* ethtool support for ixgbe */
 
-#include <linux/interrupt.h>
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
index 06cfaf31bcf3..08e8e25c159d 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_main.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -32,7 +32,6 @@
 #include <linux/vmalloc.h>
 #include <linux/string.h>
 #include <linux/in.h>
-#include <linux/interrupt.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/pkt_sched.h>
diff --git a/trunk/drivers/net/ixp2000/ixpdev.c b/trunk/drivers/net/ixp2000/ixpdev.c
index e122493ab70e..78ddd8b79e7e 100644
--- a/trunk/drivers/net/ixp2000/ixpdev.c
+++ b/trunk/drivers/net/ixp2000/ixpdev.c
@@ -14,7 +14,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/moduleparam.h>
 #include <linux/gfp.h>
 #include <asm/hardware/uengine.h>
diff --git a/trunk/drivers/net/jme.h b/trunk/drivers/net/jme.h
index 0d5da06489d8..e9aaeca96abc 100644
--- a/trunk/drivers/net/jme.h
+++ b/trunk/drivers/net/jme.h
@@ -24,7 +24,6 @@
 
 #ifndef __JME_H_INCLUDED__
 #define __JME_H_INCLUDED__
-#include <linux/interrupt.h>
 
 #define DRV_NAME	"jme"
 #define DRV_VERSION	"1.0.8"
diff --git a/trunk/drivers/net/ks8842.c b/trunk/drivers/net/ks8842.c
index 4a6ae057e3b1..fc12ac0d9f2e 100644
--- a/trunk/drivers/net/ks8842.c
+++ b/trunk/drivers/net/ks8842.c
@@ -23,7 +23,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
diff --git a/trunk/drivers/net/ks8851.c b/trunk/drivers/net/ks8851.c
index f56743a28fc0..bcd9ba68c9f2 100644
--- a/trunk/drivers/net/ks8851.c
+++ b/trunk/drivers/net/ks8851.c
@@ -13,7 +13,6 @@
 
 #define DEBUG
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
diff --git a/trunk/drivers/net/ks8851_mll.c b/trunk/drivers/net/ks8851_mll.c
index aefbdd896d6a..61631cace913 100644
--- a/trunk/drivers/net/ks8851_mll.c
+++ b/trunk/drivers/net/ks8851_mll.c
@@ -23,7 +23,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
diff --git a/trunk/drivers/net/ksz884x.c b/trunk/drivers/net/ksz884x.c
index 2ac6c6c984b3..41ea5920c158 100644
--- a/trunk/drivers/net/ksz884x.c
+++ b/trunk/drivers/net/ksz884x.c
@@ -17,7 +17,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/ioport.h>
diff --git a/trunk/drivers/net/lne390.c b/trunk/drivers/net/lne390.c
index f9888d20177b..8a1097cf8a83 100644
--- a/trunk/drivers/net/lne390.c
+++ b/trunk/drivers/net/lne390.c
@@ -41,7 +41,6 @@ static const char *version =
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 
diff --git a/trunk/drivers/net/macb.c b/trunk/drivers/net/macb.c
index 818f0b8c2772..6c6a02869dfc 100644
--- a/trunk/drivers/net/macb.c
+++ b/trunk/drivers/net/macb.c
@@ -15,7 +15,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/dma-mapping.h>
diff --git a/trunk/drivers/net/mace.c b/trunk/drivers/net/mace.c
index 2074e9724ba3..1c5221f79d6f 100644
--- a/trunk/drivers/net/mace.c
+++ b/trunk/drivers/net/mace.c
@@ -13,7 +13,6 @@
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/crc32.h>
 #include <linux/spinlock.h>
 #include <linux/bitrev.h>
diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c
index cc67cbe670cb..d6aeaa5f25ea 100644
--- a/trunk/drivers/net/macvlan.c
+++ b/trunk/drivers/net/macvlan.c
@@ -414,8 +414,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key;
 #define MACVLAN_FEATURES \
 	(NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \
 	 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \
-	 NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM | \
-	 NETIF_F_HW_VLAN_FILTER)
+	 NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM)
 
 #define MACVLAN_STATE_MASK \
 	((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))
@@ -510,39 +509,6 @@ static struct rtnl_link_stats64 *macvlan_dev_get_stats64(struct net_device *dev,
 	return stats;
 }
 
-static void macvlan_vlan_rx_register(struct net_device *dev,
-				     struct vlan_group *grp)
-{
-	struct macvlan_dev *vlan = netdev_priv(dev);
-	struct net_device *lowerdev = vlan->lowerdev;
-	const struct net_device_ops *ops = lowerdev->netdev_ops;
-
-	if (ops->ndo_vlan_rx_register)
-		ops->ndo_vlan_rx_register(lowerdev, grp);
-}
-
-static void macvlan_vlan_rx_add_vid(struct net_device *dev,
-				    unsigned short vid)
-{
-	struct macvlan_dev *vlan = netdev_priv(dev);
-	struct net_device *lowerdev = vlan->lowerdev;
-	const struct net_device_ops *ops = lowerdev->netdev_ops;
-
-	if (ops->ndo_vlan_rx_add_vid)
-		ops->ndo_vlan_rx_add_vid(lowerdev, vid);
-}
-
-static void macvlan_vlan_rx_kill_vid(struct net_device *dev,
-				     unsigned short vid)
-{
-	struct macvlan_dev *vlan = netdev_priv(dev);
-	struct net_device *lowerdev = vlan->lowerdev;
-	const struct net_device_ops *ops = lowerdev->netdev_ops;
-
-	if (ops->ndo_vlan_rx_kill_vid)
-		ops->ndo_vlan_rx_kill_vid(lowerdev, vid);
-}
-
 static void macvlan_ethtool_get_drvinfo(struct net_device *dev,
 					struct ethtool_drvinfo *drvinfo)
 {
@@ -575,9 +541,6 @@ static const struct net_device_ops macvlan_netdev_ops = {
 	.ndo_set_multicast_list	= macvlan_set_multicast_list,
 	.ndo_get_stats64	= macvlan_dev_get_stats64,
 	.ndo_validate_addr	= eth_validate_addr,
-	.ndo_vlan_rx_register	= macvlan_vlan_rx_register,
-	.ndo_vlan_rx_add_vid	= macvlan_vlan_rx_add_vid,
-	.ndo_vlan_rx_kill_vid	= macvlan_vlan_rx_kill_vid,
 };
 
 void macvlan_common_setup(struct net_device *dev)
diff --git a/trunk/drivers/net/netx-eth.c b/trunk/drivers/net/netx-eth.c
index 2dfee892d200..2e4b42175f3f 100644
--- a/trunk/drivers/net/netx-eth.c
+++ b/trunk/drivers/net/netx-eth.c
@@ -18,7 +18,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c
index 543eb17acdc5..cc25bff0bd3b 100644
--- a/trunk/drivers/net/niu.c
+++ b/trunk/drivers/net/niu.c
@@ -7,7 +7,6 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/netdevice.h>
diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c
index d3afb458987e..3e4040f2f3cb 100644
--- a/trunk/drivers/net/ns83820.c
+++ b/trunk/drivers/net/ns83820.c
@@ -106,7 +106,6 @@
 #include <linux/delay.h>
 #include <linux/workqueue.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/ip.h>	/* for iph */
 #include <linux/in.h>	/* for IPPROTO_... */
 #include <linux/compiler.h>
diff --git a/trunk/drivers/net/ppp_async.c b/trunk/drivers/net/ppp_async.c
index 6436ba916fe4..a1b82c9c67d2 100644
--- a/trunk/drivers/net/ppp_async.c
+++ b/trunk/drivers/net/ppp_async.c
@@ -30,7 +30,6 @@
 #include <linux/ppp_channel.h>
 #include <linux/spinlock.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/jiffies.h>
 #include <linux/slab.h>
 #include <asm/unaligned.h>
diff --git a/trunk/drivers/net/ppp_synctty.c b/trunk/drivers/net/ppp_synctty.c
index 736a39ee05bb..2573f525f11c 100644
--- a/trunk/drivers/net/ppp_synctty.c
+++ b/trunk/drivers/net/ppp_synctty.c
@@ -44,7 +44,6 @@
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <asm/unaligned.h>
 #include <asm/uaccess.h>
diff --git a/trunk/drivers/net/ps3_gelic_net.c b/trunk/drivers/net/ps3_gelic_net.c
index 35e47c3cab35..d47abb4e7eb6 100644
--- a/trunk/drivers/net/ps3_gelic_net.c
+++ b/trunk/drivers/net/ps3_gelic_net.c
@@ -28,7 +28,6 @@
 
 #undef DEBUG
 
-#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/net/qlge/qlge.h b/trunk/drivers/net/qlge/qlge.h
index 7d8483f9012e..d32850715f5c 100644
--- a/trunk/drivers/net/qlge/qlge.h
+++ b/trunk/drivers/net/qlge/qlge.h
@@ -7,7 +7,6 @@
 #ifndef _QLGE_H_
 #define _QLGE_H_
 
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/netdevice.h>
 #include <linux/rtnetlink.h>
diff --git a/trunk/drivers/net/qlge/qlge_ethtool.c b/trunk/drivers/net/qlge/qlge_ethtool.c
index 9b67bfea035f..19b00fa0eaf0 100644
--- a/trunk/drivers/net/qlge/qlge_ethtool.c
+++ b/trunk/drivers/net/qlge/qlge_ethtool.c
@@ -650,6 +650,8 @@ static int ql_set_pauseparam(struct net_device *netdev,
 		return -EINVAL;
 
 	status = ql_mb_set_port_cfg(qdev);
+	if (status)
+		return status;
 	return status;
 }
 
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index 73108249462e..ef1ce2ebeb4a 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/drivers/net/r8169.c
@@ -22,7 +22,6 @@
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
 #include <linux/pm_runtime.h>
 #include <linux/firmware.h>
diff --git a/trunk/drivers/net/sc92031.c b/trunk/drivers/net/sc92031.c
index 9da47337b7c3..fa74314ef789 100644
--- a/trunk/drivers/net/sc92031.c
+++ b/trunk/drivers/net/sc92031.c
@@ -22,7 +22,6 @@
  * matching, so you need to enable IFF_PROMISC when using it.
  */
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/net/sfc/nic.c b/trunk/drivers/net/sfc/nic.c
index bafa23a6874c..f2a2b947f860 100644
--- a/trunk/drivers/net/sfc/nic.c
+++ b/trunk/drivers/net/sfc/nic.c
@@ -10,7 +10,6 @@
 
 #include <linux/bitops.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/module.h>
 #include <linux/seq_file.h>
diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c
index 8ad7bfbaa3af..b436e007eea0 100644
--- a/trunk/drivers/net/sis190.c
+++ b/trunk/drivers/net/sis190.c
@@ -21,7 +21,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/netdevice.h>
diff --git a/trunk/drivers/net/skge.h b/trunk/drivers/net/skge.h
index a2eb34115844..598bf7a1a55e 100644
--- a/trunk/drivers/net/skge.h
+++ b/trunk/drivers/net/skge.h
@@ -3,7 +3,6 @@
  */
 #ifndef _SKGE_H
 #define _SKGE_H
-#include <linux/interrupt.h>
 
 /* PCI config registers */
 #define PCI_DEV_REG1	0x40
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index d252cb123a5f..3ee41da130c2 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -32,7 +32,6 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/pci.h>
-#include <linux/interrupt.h>
 #include <linux/ip.h>
 #include <linux/slab.h>
 #include <net/ip.h>
diff --git a/trunk/drivers/net/smc-mca.c b/trunk/drivers/net/smc-mca.c
index 34934fb23b97..d07c39cb4daf 100644
--- a/trunk/drivers/net/smc-mca.c
+++ b/trunk/drivers/net/smc-mca.c
@@ -42,7 +42,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 
diff --git a/trunk/drivers/net/smc-ultra.c b/trunk/drivers/net/smc-ultra.c
index ba44ede29198..235a3c6c9f91 100644
--- a/trunk/drivers/net/smc-ultra.c
+++ b/trunk/drivers/net/smc-ultra.c
@@ -62,7 +62,6 @@ static const char version[] =
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/isapnp.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c
index 054597625d55..c6d47d10590c 100644
--- a/trunk/drivers/net/smsc911x.c
+++ b/trunk/drivers/net/smsc911x.c
@@ -37,7 +37,6 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/trunk/drivers/net/smsc9420.c b/trunk/drivers/net/smsc9420.c
index 5e5e64da5cb9..4c92ad8be765 100644
--- a/trunk/drivers/net/smsc9420.c
+++ b/trunk/drivers/net/smsc9420.c
@@ -19,7 +19,6 @@
  ***************************************************************************
  */
 
-#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/phy.h>
diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c
index 9bc6c20e8b97..949f124e1278 100644
--- a/trunk/drivers/net/spider_net.c
+++ b/trunk/drivers/net/spider_net.c
@@ -31,7 +31,6 @@
 #include <linux/if_vlan.h>
 #include <linux/in.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/gfp.h>
 #include <linux/ioport.h>
 #include <linux/ip.h>
diff --git a/trunk/drivers/net/starfire.c b/trunk/drivers/net/starfire.c
index 860a50815f84..36045f3b0327 100644
--- a/trunk/drivers/net/starfire.c
+++ b/trunk/drivers/net/starfire.c
@@ -30,7 +30,6 @@
 #define DRV_VERSION	"2.1"
 #define DRV_RELDATE	"July  6, 2008"
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
diff --git a/trunk/drivers/net/stmmac/stmmac_ethtool.c b/trunk/drivers/net/stmmac/stmmac_ethtool.c
index 720c5a1531bc..ae5213a8c4cd 100644
--- a/trunk/drivers/net/stmmac/stmmac_ethtool.c
+++ b/trunk/drivers/net/stmmac/stmmac_ethtool.c
@@ -24,7 +24,6 @@
 
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
-#include <linux/interrupt.h>
 #include <linux/mii.h>
 #include <linux/phy.h>
 
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index c8a145d72f17..a1f9f9eef37d 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -26,7 +26,6 @@
 #include <linux/delay.h>
 #include <linux/in.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/netdevice.h>
diff --git a/trunk/drivers/net/tlan.c b/trunk/drivers/net/tlan.c
index 145871b3130b..ace6404e2fac 100644
--- a/trunk/drivers/net/tlan.c
+++ b/trunk/drivers/net/tlan.c
@@ -29,10 +29,8 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/hardirq.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/eisa.h>
 #include <linux/pci.h>
diff --git a/trunk/drivers/net/tokenring/ibmtr.c b/trunk/drivers/net/tokenring/ibmtr.c
index e257a00fe14b..e896ad0e8d24 100644
--- a/trunk/drivers/net/tokenring/ibmtr.c
+++ b/trunk/drivers/net/tokenring/ibmtr.c
@@ -123,7 +123,6 @@ in the event that chatty debug messages are desired - jjs 12/30/98 */
 /* some 95 OS send many non UI frame; this allow removing the warning */
 #define TR_FILTERNONUI	1
 
-#include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/netdevice.h>
 #include <linux/ip.h>
diff --git a/trunk/drivers/net/tsi108_eth.c b/trunk/drivers/net/tsi108_eth.c
index 64cb9ac19ed9..5c633a32eaeb 100644
--- a/trunk/drivers/net/tsi108_eth.c
+++ b/trunk/drivers/net/tsi108_eth.c
@@ -33,7 +33,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/net.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/trunk/drivers/net/tulip/de2104x.c b/trunk/drivers/net/tulip/de2104x.c
index ce90efc6ba3c..e2f692351180 100644
--- a/trunk/drivers/net/tulip/de2104x.c
+++ b/trunk/drivers/net/tulip/de2104x.c
@@ -38,7 +38,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/ethtool.h>
diff --git a/trunk/drivers/net/tulip/pnic.c b/trunk/drivers/net/tulip/pnic.c
index 52d898bdbeb4..aa4d9dad0395 100644
--- a/trunk/drivers/net/tulip/pnic.c
+++ b/trunk/drivers/net/tulip/pnic.c
@@ -13,7 +13,6 @@
 	Please submit bugs to http://bugzilla.kernel.org/ .
 */
 
-#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/jiffies.h>
 #include "tulip.h"
diff --git a/trunk/drivers/net/tulip/tulip_core.c b/trunk/drivers/net/tulip/tulip_core.c
index 1246998a677c..82f87647207e 100644
--- a/trunk/drivers/net/tulip/tulip_core.c
+++ b/trunk/drivers/net/tulip/tulip_core.c
@@ -28,7 +28,6 @@
 #include <linux/slab.h>
 #include "tulip.h"
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/trunk/drivers/net/vxge/vxge-config.h b/trunk/drivers/net/vxge/vxge-config.h
index 6219006d9d2e..359b9b9f8041 100644
--- a/trunk/drivers/net/vxge/vxge-config.h
+++ b/trunk/drivers/net/vxge/vxge-config.h
@@ -13,7 +13,6 @@
  ******************************************************************************/
 #ifndef VXGE_CONFIG_H
 #define VXGE_CONFIG_H
-#include <linux/hardirq.h>
 #include <linux/list.h>
 #include <linux/slab.h>
 
diff --git a/trunk/drivers/net/vxge/vxge-main.c b/trunk/drivers/net/vxge/vxge-main.c
index e658edd1c959..8ab870a2ad02 100644
--- a/trunk/drivers/net/vxge/vxge-main.c
+++ b/trunk/drivers/net/vxge/vxge-main.c
@@ -44,7 +44,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/if_vlan.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/tcp.h>
diff --git a/trunk/drivers/net/wan/cycx_main.c b/trunk/drivers/net/wan/cycx_main.c
index a0976d1f97c6..859dba9b972e 100644
--- a/trunk/drivers/net/wan/cycx_main.c
+++ b/trunk/drivers/net/wan/cycx_main.c
@@ -50,7 +50,6 @@
 #include <linux/wanrouter.h>	/* WAN router definitions */
 #include <linux/cyclomx.h>	/* cyclomx common user API definitions */
 #include <linux/init.h>         /* __init (when not using as a module) */
-#include <linux/interrupt.h>
 
 unsigned int cycx_debug;
 
diff --git a/trunk/drivers/net/wan/dscc4.c b/trunk/drivers/net/wan/dscc4.c
index 3590d588327c..acb9ea830628 100644
--- a/trunk/drivers/net/wan/dscc4.c
+++ b/trunk/drivers/net/wan/dscc4.c
@@ -99,7 +99,6 @@
 #include <asm/irq.h>
 
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/string.h>
 
 #include <linux/if_arp.h>
diff --git a/trunk/drivers/net/wan/farsync.c b/trunk/drivers/net/wan/farsync.c
index 1eba06f6fa4c..e050bd65e037 100644
--- a/trunk/drivers/net/wan/farsync.c
+++ b/trunk/drivers/net/wan/farsync.c
@@ -25,7 +25,6 @@
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/if.h>
 #include <linux/hdlc.h>
 #include <asm/io.h>
diff --git a/trunk/drivers/net/wan/wanxl.c b/trunk/drivers/net/wan/wanxl.c
index 4ea89fe0006f..db73a7be199f 100644
--- a/trunk/drivers/net/wan/wanxl.c
+++ b/trunk/drivers/net/wan/wanxl.c
@@ -22,7 +22,6 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/netdevice.h>
 #include <linux/hdlc.h>
diff --git a/trunk/drivers/net/wireless/adm8211.c b/trunk/drivers/net/wireless/adm8211.c
index 43ebc44fc82c..afe2cbc6cb24 100644
--- a/trunk/drivers/net/wireless/adm8211.c
+++ b/trunk/drivers/net/wireless/adm8211.c
@@ -16,7 +16,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/if.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/net/wireless/ath/ath9k/ath9k.h b/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
index e99dfe6065bf..f75068b4b310 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -19,7 +19,6 @@
 
 #include <linux/etherdevice.h>
 #include <linux/device.h>
-#include <linux/interrupt.h>
 #include <linux/leds.h>
 #include <linux/completion.h>
 
diff --git a/trunk/drivers/net/wireless/atmel.c b/trunk/drivers/net/wireless/atmel.c
index 7e45ca2e78ef..39a11e8af4fa 100644
--- a/trunk/drivers/net/wireless/atmel.c
+++ b/trunk/drivers/net/wireless/atmel.c
@@ -40,7 +40,6 @@
 ******************************************************************************/
 
 #include <linux/init.h>
-#include <linux/interrupt.h>
 
 #include <linux/kernel.h>
 #include <linux/ptrace.h>
diff --git a/trunk/drivers/net/wireless/hostap/hostap_wlan.h b/trunk/drivers/net/wireless/hostap/hostap_wlan.h
index 7bb0b4b3f2cb..88dc6a52bdf1 100644
--- a/trunk/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/trunk/drivers/net/wireless/hostap/hostap_wlan.h
@@ -1,7 +1,6 @@
 #ifndef HOSTAP_WLAN_H
 #define HOSTAP_WLAN_H
 
-#include <linux/interrupt.h>
 #include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <linux/mutex.h>
diff --git a/trunk/drivers/net/wireless/ipw2x00/ipw2200.h b/trunk/drivers/net/wireless/ipw2x00/ipw2200.h
index ecb561d7a7a0..91795b5a93c5 100644
--- a/trunk/drivers/net/wireless/ipw2x00/ipw2200.h
+++ b/trunk/drivers/net/wireless/ipw2x00/ipw2200.h
@@ -32,7 +32,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/mutex.h>
 
 #include <linux/pci.h>
diff --git a/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c b/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c
index 6623e5052254..d7bd6cf00a81 100644
--- a/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c
+++ b/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c
@@ -30,7 +30,6 @@
 
 ******************************************************************************/
 
-#include <linux/hardirq.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>
 #include <linux/module.h>
diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-dev.h b/trunk/drivers/net/wireless/iwlegacy/iwl-dev.h
index 416448acd971..be0106c6a2da 100644
--- a/trunk/drivers/net/wireless/iwlegacy/iwl-dev.h
+++ b/trunk/drivers/net/wireless/iwlegacy/iwl-dev.h
@@ -32,7 +32,6 @@
 #ifndef __iwl_legacy_dev_h__
 #define __iwl_legacy_dev_h__
 
-#include <linux/interrupt.h>
 #include <linux/pci.h> /* for struct pci_device_id */
 #include <linux/kernel.h>
 #include <linux/leds.h>
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h
index 1f4797d9848d..22a6e3ec7094 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -31,7 +31,6 @@
 #ifndef __iwl_dev_h__
 #define __iwl_dev_h__
 
-#include <linux/interrupt.h>
 #include <linux/pci.h> /* for struct pci_device_id */
 #include <linux/kernel.h>
 #include <linux/wait.h>
diff --git a/trunk/drivers/net/wireless/libertas/cfg.c b/trunk/drivers/net/wireless/libertas/cfg.c
index b456a53b64b1..5d637af2d7c3 100644
--- a/trunk/drivers/net/wireless/libertas/cfg.c
+++ b/trunk/drivers/net/wireless/libertas/cfg.c
@@ -8,7 +8,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/hardirq.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/net/wireless/libertas/cmd.c b/trunk/drivers/net/wireless/libertas/cmd.c
index 9dcf967e1ee4..71c8f3fccfa1 100644
--- a/trunk/drivers/net/wireless/libertas/cmd.c
+++ b/trunk/drivers/net/wireless/libertas/cmd.c
@@ -3,7 +3,6 @@
  * It prepares command and sends it to firmware when it is ready.
  */
 
-#include <linux/hardirq.h>
 #include <linux/kfifo.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/net/wireless/libertas/cmdresp.c b/trunk/drivers/net/wireless/libertas/cmdresp.c
index 2ffe5a1ff003..207fc361db84 100644
--- a/trunk/drivers/net/wireless/libertas/cmdresp.c
+++ b/trunk/drivers/net/wireless/libertas/cmdresp.c
@@ -3,7 +3,6 @@
  * responses as well as events generated by firmware.
  */
 
-#include <linux/hardirq.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
diff --git a/trunk/drivers/net/wireless/libertas/debugfs.c b/trunk/drivers/net/wireless/libertas/debugfs.c
index 1af182778844..23250f621761 100644
--- a/trunk/drivers/net/wireless/libertas/debugfs.c
+++ b/trunk/drivers/net/wireless/libertas/debugfs.c
@@ -1,7 +1,6 @@
 #include <linux/dcache.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
-#include <linux/hardirq.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/net/wireless/libertas/ethtool.c b/trunk/drivers/net/wireless/libertas/ethtool.c
index 4dfb3bfd2cf3..29dbce4a9f86 100644
--- a/trunk/drivers/net/wireless/libertas/ethtool.c
+++ b/trunk/drivers/net/wireless/libertas/ethtool.c
@@ -1,4 +1,3 @@
-#include <linux/hardirq.h>
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/net/wireless/libertas/if_spi.c b/trunk/drivers/net/wireless/libertas/if_spi.c
index 4fa0be9943f9..463352c890d7 100644
--- a/trunk/drivers/net/wireless/libertas/if_spi.c
+++ b/trunk/drivers/net/wireless/libertas/if_spi.c
@@ -19,8 +19,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/hardirq.h>
-#include <linux/interrupt.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
 #include <linux/jiffies.h>
diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
index cf3d2c8e1969..8c40949cb076 100644
--- a/trunk/drivers/net/wireless/libertas/main.c
+++ b/trunk/drivers/net/wireless/libertas/main.c
@@ -9,7 +9,6 @@
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
-#include <linux/hardirq.h>
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/kthread.h>
diff --git a/trunk/drivers/net/wireless/libertas/mesh.c b/trunk/drivers/net/wireless/libertas/mesh.c
index 7969d104189d..24cf06680c6b 100644
--- a/trunk/drivers/net/wireless/libertas/mesh.c
+++ b/trunk/drivers/net/wireless/libertas/mesh.c
@@ -2,7 +2,6 @@
 
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
-#include <linux/hardirq.h>
 #include <linux/netdevice.h>
 #include <linux/if_ether.h>
 #include <linux/if_arp.h>
diff --git a/trunk/drivers/net/wireless/libertas/rx.c b/trunk/drivers/net/wireless/libertas/rx.c
index bfb8898ae518..fdb0448301a0 100644
--- a/trunk/drivers/net/wireless/libertas/rx.c
+++ b/trunk/drivers/net/wireless/libertas/rx.c
@@ -5,7 +5,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/etherdevice.h>
-#include <linux/hardirq.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <net/cfg80211.h>
diff --git a/trunk/drivers/net/wireless/libertas/tx.c b/trunk/drivers/net/wireless/libertas/tx.c
index f19495b178f6..bbb95f88dc01 100644
--- a/trunk/drivers/net/wireless/libertas/tx.c
+++ b/trunk/drivers/net/wireless/libertas/tx.c
@@ -1,7 +1,6 @@
 /*
  * This file contains the handling of TX in wlan driver.
  */
-#include <linux/hardirq.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/sched.h>
diff --git a/trunk/drivers/net/wireless/libertas_tf/cmd.c b/trunk/drivers/net/wireless/libertas_tf/cmd.c
index 13557fe0bf95..8945afd6ce3e 100644
--- a/trunk/drivers/net/wireless/libertas_tf/cmd.c
+++ b/trunk/drivers/net/wireless/libertas_tf/cmd.c
@@ -9,7 +9,6 @@
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/hardirq.h>
 #include <linux/slab.h>
 
 #include "libertas_tf.h"
diff --git a/trunk/drivers/net/wireless/libertas_tf/main.c b/trunk/drivers/net/wireless/libertas_tf/main.c
index 5beb58142e97..d4005081f1df 100644
--- a/trunk/drivers/net/wireless/libertas_tf/main.c
+++ b/trunk/drivers/net/wireless/libertas_tf/main.c
@@ -9,7 +9,6 @@
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/hardirq.h>
 #include <linux/slab.h>
 
 #include <linux/etherdevice.h>
diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c
index 8ff43c281411..32261189bcef 100644
--- a/trunk/drivers/net/wireless/mwl8k.c
+++ b/trunk/drivers/net/wireless/mwl8k.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/trunk/drivers/net/wireless/p54/p54pci.h b/trunk/drivers/net/wireless/p54/p54pci.h
index 7aa509f7e387..ee9bc62a4fa2 100644
--- a/trunk/drivers/net/wireless/p54/p54pci.h
+++ b/trunk/drivers/net/wireless/p54/p54pci.h
@@ -1,6 +1,5 @@
 #ifndef P54PCI_H
 #define P54PCI_H
-#include <linux/interrupt.h>
 
 /*
  * Defines for PCI based mac80211 Prism54 driver
diff --git a/trunk/drivers/net/wireless/prism54/islpci_dev.c b/trunk/drivers/net/wireless/prism54/islpci_dev.c
index 5d0f61508a2e..ec2c75d77cea 100644
--- a/trunk/drivers/net/wireless/prism54/islpci_dev.c
+++ b/trunk/drivers/net/wireless/prism54/islpci_dev.c
@@ -18,7 +18,6 @@
  *
  */
 
-#include <linux/hardirq.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 
diff --git a/trunk/drivers/net/wireless/prism54/islpci_dev.h b/trunk/drivers/net/wireless/prism54/islpci_dev.h
index c40403877f97..c4d0f19b7cbc 100644
--- a/trunk/drivers/net/wireless/prism54/islpci_dev.h
+++ b/trunk/drivers/net/wireless/prism54/islpci_dev.h
@@ -22,7 +22,6 @@
 #ifndef _ISLPCI_DEV_H
 #define _ISLPCI_DEV_H
 
-#include <linux/irqreturn.h>
 #include <linux/netdevice.h>
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
diff --git a/trunk/drivers/net/wireless/prism54/islpci_hotplug.c b/trunk/drivers/net/wireless/prism54/islpci_hotplug.c
index 9e68e0cb718e..b5e64d71b7a6 100644
--- a/trunk/drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/trunk/drivers/net/wireless/prism54/islpci_hotplug.c
@@ -17,7 +17,6 @@
  *
  */
 
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00.h b/trunk/drivers/net/wireless/rt2x00/rt2x00.h
index 4efaf886fb89..c446db69bd3c 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00.h
@@ -29,7 +29,6 @@
 #define RT2X00_H
 
 #include <linux/bitops.h>
-#include <linux/interrupt.h>
 #include <linux/skbuff.h>
 #include <linux/workqueue.h>
 #include <linux/firmware.h>
diff --git a/trunk/drivers/net/wireless/rtl818x/rtl8180/dev.c b/trunk/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 66b29dc07cc3..80db5cabc9b9 100644
--- a/trunk/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/trunk/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -16,7 +16,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/net/wireless/wl1251/sdio.c b/trunk/drivers/net/wireless/wl1251/sdio.c
index f78694295c39..f51a0241a440 100644
--- a/trunk/drivers/net/wireless/wl1251/sdio.c
+++ b/trunk/drivers/net/wireless/wl1251/sdio.c
@@ -19,7 +19,6 @@
  * Copyright (C) 2008 Google Inc
  * Copyright (C) 2009 Bob Copeland (me@bobcopeland.com)
  */
-#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/mod_devicetable.h>
 #include <linux/mmc/sdio_func.h>
diff --git a/trunk/drivers/net/wireless/wl1251/spi.c b/trunk/drivers/net/wireless/wl1251/spi.c
index eaa5f9556200..af6448c4d3e2 100644
--- a/trunk/drivers/net/wireless/wl1251/spi.c
+++ b/trunk/drivers/net/wireless/wl1251/spi.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/trunk/drivers/net/wireless/wl12xx/io.h b/trunk/drivers/net/wireless/wl12xx/io.h
index 20b00319e444..beed621a8ae0 100644
--- a/trunk/drivers/net/wireless/wl12xx/io.h
+++ b/trunk/drivers/net/wireless/wl12xx/io.h
@@ -25,7 +25,6 @@
 #ifndef __IO_H__
 #define __IO_H__
 
-#include <linux/irqreturn.h>
 #include "reg.h"
 
 #define HW_ACCESS_MEMORY_MAX_RANGE	0x1FFC0
diff --git a/trunk/drivers/net/wireless/wl12xx/spi.c b/trunk/drivers/net/wireless/wl12xx/spi.c
index beebf64c5359..51662bb68019 100644
--- a/trunk/drivers/net/wireless/wl12xx/spi.c
+++ b/trunk/drivers/net/wireless/wl12xx/spi.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/crc7.h>
diff --git a/trunk/drivers/s390/net/ctcm_mpc.h b/trunk/drivers/s390/net/ctcm_mpc.h
index 1fa07b0c11c0..5336120cddf1 100644
--- a/trunk/drivers/s390/net/ctcm_mpc.h
+++ b/trunk/drivers/s390/net/ctcm_mpc.h
@@ -12,7 +12,6 @@
 #ifndef _CTC_MPC_H_
 #define _CTC_MPC_H_
 
-#include <linux/interrupt.h>
 #include <linux/skbuff.h>
 #include "fsm.h"
 
diff --git a/trunk/include/linux/arcdevice.h b/trunk/include/linux/arcdevice.h
index 7216b0daf544..7d650a0e3d8f 100644
--- a/trunk/include/linux/arcdevice.h
+++ b/trunk/include/linux/arcdevice.h
@@ -20,7 +20,6 @@
 #include <linux/if_arcnet.h>
 
 #ifdef __KERNEL__
-#include  <linux/irqreturn.h>
 
 #ifndef bool
 #define bool int
diff --git a/trunk/include/linux/dccp.h b/trunk/include/linux/dccp.h
index 710c04302a15..d638e85dc501 100644
--- a/trunk/include/linux/dccp.h
+++ b/trunk/include/linux/dccp.h
@@ -236,7 +236,6 @@ enum dccp_packet_dequeueing_policy {
 #ifdef __KERNEL__
 
 #include <linux/in.h>
-#include <linux/interrupt.h>
 #include <linux/ktime.h>
 #include <linux/list.h>
 #include <linux/uio.h>
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 336288567c78..ca333e79e10f 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -1563,6 +1563,7 @@ struct packet_type {
 	struct list_head	list;
 };
 
+#include <linux/interrupt.h>
 #include <linux/notifier.h>
 
 extern rwlock_t				dev_base_lock;		/* Device list lock */
diff --git a/trunk/include/net/bluetooth/hci_core.h b/trunk/include/net/bluetooth/hci_core.h
index 7851c05833e2..6c994c004d15 100644
--- a/trunk/include/net/bluetooth/hci_core.h
+++ b/trunk/include/net/bluetooth/hci_core.h
@@ -25,7 +25,6 @@
 #ifndef __HCI_CORE_H
 #define __HCI_CORE_H
 
-#include <linux/interrupt.h>
 #include <net/bluetooth/hci.h>
 
 /* HCI upper protocols */
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index ebbc0bafe661..f2046e404a61 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -40,7 +40,6 @@
 #ifndef _SOCK_H
 #define _SOCK_H
 
-#include <linux/hardirq.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/list_nulls.h>
diff --git a/trunk/net/atm/pppoatm.c b/trunk/net/atm/pppoatm.c
index db4a11c61d15..e9aced0ec56b 100644
--- a/trunk/net/atm/pppoatm.c
+++ b/trunk/net/atm/pppoatm.c
@@ -37,7 +37,6 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <linux/atm.h>
diff --git a/trunk/net/caif/chnl_net.c b/trunk/net/caif/chnl_net.c
index c628a57953c9..adbb424403d4 100644
--- a/trunk/net/caif/chnl_net.c
+++ b/trunk/net/caif/chnl_net.c
@@ -9,7 +9,6 @@
 
 #include <linux/version.h>
 #include <linux/fs.h>
-#include <linux/hardirq.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
diff --git a/trunk/net/can/bcm.c b/trunk/net/can/bcm.c
index d6c8ae5b2e6a..184a6572b67e 100644
--- a/trunk/net/can/bcm.c
+++ b/trunk/net/can/bcm.c
@@ -43,7 +43,6 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/hrtimer.h>
 #include <linux/list.h>
 #include <linux/proc_fs.h>
diff --git a/trunk/net/rds/ib.h b/trunk/net/rds/ib.h
index edfaaaf164eb..4297d92788dc 100644
--- a/trunk/net/rds/ib.h
+++ b/trunk/net/rds/ib.h
@@ -3,7 +3,6 @@
 
 #include <rdma/ib_verbs.h>
 #include <rdma/rdma_cm.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include "rds.h"
diff --git a/trunk/net/rds/iw.h b/trunk/net/rds/iw.h
index 04ce3b193f79..90151922178c 100644
--- a/trunk/net/rds/iw.h
+++ b/trunk/net/rds/iw.h
@@ -1,7 +1,6 @@
 #ifndef _RDS_IW_H
 #define _RDS_IW_H
 
-#include <linux/interrupt.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/rdma_cm.h>
 #include "rds.h"
diff --git a/trunk/net/sched/sch_atm.c b/trunk/net/sched/sch_atm.c
index e25e49061a0d..3f08158b8688 100644
--- a/trunk/net/sched/sch_atm.c
+++ b/trunk/net/sched/sch_atm.c
@@ -5,7 +5,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/skbuff.h>
diff --git a/trunk/net/sctp/protocol.c b/trunk/net/sctp/protocol.c
index ab5ded2c58de..af0a6b0fc9b6 100644
--- a/trunk/net/sctp/protocol.c
+++ b/trunk/net/sctp/protocol.c
@@ -637,7 +637,6 @@ void sctp_addr_wq_timeout_handler(unsigned long arg)
 		    " for cmd %d at entry %p\n", &sctp_addr_waitq, &addrw->a, addrw->state,
 		    addrw);
 
-#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 		/* Now we send an ASCONF for each association */
 		/* Note. we currently don't handle link local IPv6 addressees */
 		if (addrw->a.sa.sa_family == AF_INET6) {
@@ -660,7 +659,7 @@ void sctp_addr_wq_timeout_handler(unsigned long arg)
 				break;
 			}
 		}
-#endif
+
 		list_for_each_entry(sp, &sctp_auto_asconf_splist, auto_asconf_list) {
 			struct sock *sk;
 
diff --git a/trunk/net/sunrpc/xprtrdma/svc_rdma_transport.c b/trunk/net/sunrpc/xprtrdma/svc_rdma_transport.c
index a385430c722a..c3c232a88d94 100644
--- a/trunk/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/trunk/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -42,7 +42,6 @@
 #include <linux/sunrpc/svc_xprt.h>
 #include <linux/sunrpc/debug.h>
 #include <linux/sunrpc/rpc_rdma.h>
-#include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
diff --git a/trunk/net/sunrpc/xprtrdma/verbs.c b/trunk/net/sunrpc/xprtrdma/verbs.c
index 28236bab57f9..80f8da344df5 100644
--- a/trunk/net/sunrpc/xprtrdma/verbs.c
+++ b/trunk/net/sunrpc/xprtrdma/verbs.c
@@ -47,7 +47,6 @@
  *  o buffer memory
  */
 
-#include <linux/interrupt.h>
 #include <linux/pci.h>	/* for Tavor hack below */
 #include <linux/slab.h>