From 1594b0d57d4fb20d8518d138f56a121cab78f1c8 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 19 Sep 2010 10:42:11 -0700
Subject: [PATCH] compat: pcmcia/cs.h is removed form new kernels

On older kernel versions we have to include pcmcia/cs_types.h and
pcmcia/cs.h before pcmcia/cistpl.h.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 include/pcmcia/{cs.h => cistpl.h} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename include/pcmcia/{cs.h => cistpl.h} (53%)

diff --git a/include/pcmcia/cs.h b/include/pcmcia/cistpl.h
similarity index 53%
rename from include/pcmcia/cs.h
rename to include/pcmcia/cistpl.h
index 1c5e0fa57dd6..789dc59db726 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cistpl.h
@@ -1,10 +1,10 @@
-#ifndef _COMPAT_PCMCIA_CS_H
-#define _COMPAT_PCMCIA_CS_H
 #include <linux/version.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
 #include <pcmcia/cs_types.h>
 #endif
-
-#include_next <pcmcia/cs.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+#include <pcmcia/cs.h>
 #endif
+
+#include_next <pcmcia/cistpl.h>
-- 
2.30.2