Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[linux-2.6-omap-h63xx.git] / include / linux / memstick.h

diff --git a/include/linux/memstick.h b/include/linux/memstick.h
index b7ee25888836761e38ad6a3f3db90225961ec573..37a5cdb03918ffcee2a390b12fe391cdfbf62e69 100644 (file)
--- a/include/linux/memstick.h
+++ b/include/linux/memstick.h
@@ -239,7 +239,6 @@ struct memstick_request {
        unsigned char tpc;
        unsigned char data_dir:1,
                      need_card_int:1,
-                     get_int_reg:1,
                      long_data:1;
        unsigned char int_reg;
        int           error;
@@ -277,7 +276,7 @@ struct memstick_host {
 #define MEMSTICK_CAP_PAR8          4
 
        struct work_struct  media_checker;
-       struct class_device cdev;
+       struct device       dev;
 
        struct memstick_dev *card;
        unsigned int        retries;