Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / arch / arm / mach-omap1 / time.c

diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index 64c2d69c615c0648428828b00da7eb03ea37b37f..a01f0efdae142f0327f1a1c0b5a5b9045892909e 100644 (file)
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -33,7 +33,6 @@
  * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>