Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6] / drivers / pcmcia / tcic.c

diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c
index f158b67f661007c7b9a1ef64fd55a08f9f70d154..e312638643771c27bb75ce8f81c823b809a51a2b 100644 (file)
--- a/drivers/pcmcia/tcic.c
+++ b/drivers/pcmcia/tcic.c
@@ -44,7 +44,7 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/workqueue.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/bitops.h>
 
 #include <asm/io.h>