diff --git a/[refs] b/[refs]
index bc998bd160df..afad657e66da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4119a43187139736750bad5d694c6a839df045d
+refs/heads/master: f22f8567cb0a530d8958d177e0f268783bd0d894
diff --git a/trunk/drivers/net/loopback.c b/trunk/drivers/net/loopback.c
index 49f6bc036a92..46e87cc87251 100644
--- a/trunk/drivers/net/loopback.c
+++ b/trunk/drivers/net/loopback.c
@@ -234,9 +234,7 @@ static void loopback_setup(struct net_device *dev)
 	dev->type		= ARPHRD_LOOPBACK;	/* 0x0001*/
 	dev->flags		= IFF_LOOPBACK;
 	dev->features 		= NETIF_F_SG | NETIF_F_FRAGLIST
-#ifdef LOOPBACK_TSO
 		| NETIF_F_TSO
-#endif
 		| NETIF_F_NO_CSUM
 		| NETIF_F_HIGHDMA
 		| NETIF_F_LLTX