diff --git a/[refs] b/[refs]
index a7349c7d0562..42de8efca443 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff08546b12a6ab3a8a9992627926a03d2176656e
+refs/heads/master: 7e4ee4d947b8499451705ec8ce419b3321d14edf
diff --git a/trunk/drivers/net/cassini.c b/trunk/drivers/net/cassini.c
index 0d911bacc25f..28c88eeec757 100644
--- a/trunk/drivers/net/cassini.c
+++ b/trunk/drivers/net/cassini.c
@@ -107,12 +107,7 @@
 #define cas_page_unmap(x)    kunmap_atomic((x), KM_SKB_DATA_SOFTIRQ)
 #define CAS_NCPUS            num_online_cpus()
 
-#ifdef CONFIG_CASSINI_NAPI
-#define USE_NAPI
-#define cas_skb_release(x)  netif_receive_skb(x)
-#else
 #define cas_skb_release(x)  netif_rx(x)
-#endif
 
 /* select which firmware to use */
 #define USE_HP_WORKAROUND