Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[powerpc.git] / include / pcmcia / ss.h

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 623a0fc..6e84258 100644 (file)
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -284,7 +284,7 @@ struct pcmcia_socket {
 #endif
 
        /* socket device */
-       struct class_device             dev;
+       struct device                   dev;
        void                            *driver_data;   /* data internal to the socket driver */
 
 };