Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / include / linux / maple.h

diff --git a/include/linux/maple.h b/include/linux/maple.h
index 35c3474ccf6843623ee131adf439cad5784d52c1..d31e36ebb436fd25ec087ac135b5fdbef68ff815 100644 (file)
--- a/include/linux/maple.h
+++ b/include/linux/maple.h
@@ -39,7 +39,7 @@ struct maple_devinfo {
        unsigned long function;
        unsigned long function_data[3];
        unsigned char area_code;
-       unsigned char connector_directon;
+       unsigned char connector_direction;
        char product_name[31];
        char product_licence[61];
        unsigned short standby_power;
@@ -64,7 +64,6 @@ struct maple_driver {
        int (*connect) (struct maple_device * dev);
        void (*disconnect) (struct maple_device * dev);
        struct device_driver drv;
-       int registered;
 };
 
 void maple_getcond_callback(struct maple_device *dev,