aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-28 23:44:45 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-29 09:43:18 +0200
commit35200d865d49d0207b054074055e1487a0c28ae4 (patch)
treedc4310fb9837534d7aa0b9ae3cbeb8e3895ada55 /include/pcmcia
parentd39bd56452b509f8d6054883b8a0129950ba50cc (diff)
downloadmrst-s0i3-test-35200d865d49d0207b054074055e1487a0c28ae4.tar.gz
mrst-s0i3-test-35200d865d49d0207b054074055e1487a0c28ae4.tar.xz
mrst-s0i3-test-35200d865d49d0207b054074055e1487a0c28ae4.zip
pcmcia: device_id header cleanup
Wrap in #ifdef to include header just once, and wrap in another #ifdef to avoid it being used in userspace. Also, format the header similar to the other PCMCIA header files. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
-rw-r--r--include/pcmcia/device_id.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/include/pcmcia/device_id.h b/include/pcmcia/device_id.h
index e04e0b0d9a2..c33ea08352b 100644
--- a/include/pcmcia/device_id.h
+++ b/include/pcmcia/device_id.h
@@ -1,10 +1,19 @@
/*
- * Copyright (2003-2004) Dominik Brodowski <linux@brodo.de>
- * David Woodhouse
+ * device_id.h -- PCMCIA driver matching helpers
*
- * License: GPL v2
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * (C) 2003 - 2004 David Woodhouse
+ * (C) 2003 - 2004 Dominik Brodowski
*/
+#ifndef _LINUX_PCMCIA_DEVICE_ID_H
+#define _LINUX_PCMCIA_DEVICE_ID_H
+
+#ifdef __KERNEL__
+
#define PCMCIA_DEVICE_MANF_CARD(manf, card) { \
.match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \
PCMCIA_DEV_ID_MATCH_CARD_ID, \
@@ -256,3 +265,6 @@
#define PCMCIA_DEVICE_NULL { .match_flags = 0, }
+
+#endif /* __KERNEL__ */
+#endif /* _LINUX_PCMCIA_DEVICE_ID_H */