summaryrefslogtreecommitdiff
path: root/linux/pcmcia-cs
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2016-01-23 21:30:07 +0100
committerRichard Braun <rbraun@sceen.net>2016-01-23 21:30:07 +0100
commit8bde80c03f475f06b62962905dc6766f5bc28c4c (patch)
tree28c0dd9f3b460b09ce1d9f8e7926b02bb93576b1 /linux/pcmcia-cs
parentbee3f0799656116cee095f79f6aa91d18157c0f0 (diff)
parente835160b6b95f3b904fbc429392a63be1e4ed6b8 (diff)
Merge branch 'rbraun/vm_page'
Diffstat (limited to 'linux/pcmcia-cs')
-rw-r--r--linux/pcmcia-cs/glue/ds.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/linux/pcmcia-cs/glue/ds.c b/linux/pcmcia-cs/glue/ds.c
index 8f88b55..cc4b92b 100644
--- a/linux/pcmcia-cs/glue/ds.c
+++ b/linux/pcmcia-cs/glue/ds.c
@@ -24,12 +24,6 @@
/* This file is included from linux/pcmcia-cs/modules/ds.c. */
/*
- * Prepare the namespace for inclusion of Mach header files.
- */
-
-#undef PAGE_SHIFT
-
-/*
* This is really ugly. But this is glue code, so... It's about the `kfree'
* symbols in <linux/malloc.h> and <kern/kalloc.h>.
*/