include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[net-next-2.6.git] / drivers / usb / gadget / f_ecm.c

diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c
index ecf5bdd0ae069d277e41a26aa613a6dac28678e3..4e595324c614f6c8578055f8c577ad7a818b3e99 100644 (file)
--- a/drivers/usb/gadget/f_ecm.c
+++ b/drivers/usb/gadget/f_ecm.c
@@ -21,6 +21,7 @@
 
 /* #define VERBOSE_DEBUG */
 
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/etherdevice.h>
@@ -497,12 +498,9 @@ static int ecm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
                        struct net_device       *net;
 
                        /* Enable zlps by default for ECM conformance;
-                        * override for musb_hdrc (avoids txdma ovhead)
-                        * and sa1100 (can't).
+                        * override for musb_hdrc (avoids txdma ovhead).
                         */
-                       ecm->port.is_zlp_ok = !(
-                                  gadget_is_sa1100(cdev->gadget)
-                               || gadget_is_musbhdrc(cdev->gadget)
+                       ecm->port.is_zlp_ok = !(gadget_is_musbhdrc(cdev->gadget)
                                );
                        ecm->port.cdc_filter = DEFAULT_FILTER;
                        DBG(cdev, "activate ecm\n");