Merge tag 'nfs-for-3.17-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[karo-tx-linux.git] / drivers / net / usb / cdc_subset.c

diff --git a/drivers/net/usb/cdc_subset.c b/drivers/net/usb/cdc_subset.c
index 3ef411efd86ece66f59053d638f7fa34fd67995c..6ea98cff2d3bf8df13d5e8deee032b971b81d0dd 100644 (file)
--- a/drivers/net/usb/cdc_subset.c
+++ b/drivers/net/usb/cdc_subset.c
@@ -99,16 +99,6 @@ static void m5632_recover(struct usbnet *dev)
        usb_unlock_device(udev);
 }
 
-static int dummy_prereset(struct usb_interface *intf)
-{
-       return 0;
-}
-
-static int dummy_postreset(struct usb_interface *intf)
-{
-       return 0;
-}
-
 static const struct driver_info        ali_m5632_info = {
        .description =  "ALi M5632",
        .flags       = FLAG_POINTTOPOINT,
@@ -117,7 +107,6 @@ static const struct driver_info     ali_m5632_info = {
 
 #endif
 
-\f
 #ifdef CONFIG_USB_AN2720
 #define        HAVE_HARDWARE
 
@@ -351,6 +340,15 @@ static const struct usb_device_id  products [] = {
 MODULE_DEVICE_TABLE(usb, products);
 
 /*-------------------------------------------------------------------------*/
+static int dummy_prereset(struct usb_interface *intf)
+{
+        return 0;
+}
+
+static int dummy_postreset(struct usb_interface *intf)
+{
+        return 0;
+}
 
 static struct usb_driver cdc_subset_driver = {
        .name =         "cdc_subset",