Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / drivers / usb / atm / xusbatm.c

diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c
index 83848ee2c6fe28ed1fb55fa67826399724e6602a..70125c6d3be49d12fa9ae47947b65ab2cadcae0f 100644 (file)
--- a/drivers/usb/atm/xusbatm.c
+++ b/drivers/usb/atm/xusbatm.c
@@ -20,7 +20,6 @@
  ******************************************************************************/
 
 #include <linux/module.h>
-#include <linux/netdevice.h>           /* FIXME: required by linux/etherdevice.h */
 #include <linux/etherdevice.h>         /* for random_ether_addr() */
 
 #include "usbatm.h"
@@ -210,8 +209,8 @@ static int __init xusbatm_init(void)
                xusbatm_drivers[i].bind         = xusbatm_bind;
                xusbatm_drivers[i].unbind       = xusbatm_unbind;
                xusbatm_drivers[i].atm_start    = xusbatm_atm_start;
-               xusbatm_drivers[i].in           = rx_endpoint[i];
-               xusbatm_drivers[i].out          = tx_endpoint[i];
+               xusbatm_drivers[i].bulk_in      = rx_endpoint[i];
+               xusbatm_drivers[i].bulk_out     = tx_endpoint[i];
                xusbatm_drivers[i].rx_padding   = rx_padding[i];
                xusbatm_drivers[i].tx_padding   = tx_padding[i];
        }