Merge branch 'master' into upstream

[linux-2.6] / drivers / spi / spi_s3c24xx_gpio.c

diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index aacdceb8f44b69e783ba7b9d15f04c6247f1c9c3..a5d2cdfff46f9aeae510956558e2e429f72b920d 100644 (file)
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -11,7 +11,6 @@
  *
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>