summaryrefslogtreecommitdiff
path: root/include/pcmcia/cs_types.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 17:00:33 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 17:00:33 (GMT)
commit3d14b5beba35250c548d3851a2b84fce742d8311 (patch)
tree065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /include/pcmcia/cs_types.h
parent0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff)
parent1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff)
downloadlinux-fsl-qoriq-3d14b5beba35250c548d3851a2b84fce742d8311.tar.xz
Merge branch 'sa1100' into devel
Diffstat (limited to 'include/pcmcia/cs_types.h')
-rw-r--r--include/pcmcia/cs_types.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/pcmcia/cs_types.h b/include/pcmcia/cs_types.h
index 315965a..f5e3b83 100644
--- a/include/pcmcia/cs_types.h
+++ b/include/pcmcia/cs_types.h
@@ -26,8 +26,7 @@ typedef u_int event_t;
typedef u_char cisdata_t;
typedef u_short page_t;
-struct window_t;
-typedef struct window_t *window_handle_t;
+typedef unsigned long window_handle_t;
struct region_t;
typedef struct region_t *memory_handle_t;