Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / drivers / pcmcia / sa1100_cerf.c

diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c
index 2b3c2895b43d8ef13c644847cb6e7ffed7af2d6c..eb89928f2338a52077f47b1c34158aaf20ed16c5 100644 (file)
--- a/drivers/pcmcia/sa1100_cerf.c
+++ b/drivers/pcmcia/sa1100_cerf.c
@@ -5,7 +5,6 @@
  * Based off the Assabet.
  *
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>