From 215b108c8a661546f168dc76959d0b9c860137b8 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Date: Sat, 31 Jan 2009 10:41:59 +0530
Subject: [PATCH] --- yaml --- r: 135807 b: refs/heads/master c:
 4af3bf6b393a2cec947cd42cc10fc03f5b782484 h: refs/heads/master i:   135805:
 d6bfe7012a2905426c9fce0c1a469fd63849cc01   135803:
 d1a91c4cf67c06d3425a31e8695a880ce8fb5ec1   135799:
 4ea78e9af82958b7d235ec18b6279d8d8b73f4ab   135791:
 0c7223d95314fd16c38061df7595eec9df31dfcc   135775:
 b2f9efc00ba4af67428fce1092e443b1074d15ae   135743:
 141678741ce6733a9a0ce3662993228357ddfcc9   135679:
 d5790cf00576d96afc26454e44d3ae38f8eaf048 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/include/asm/setup.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 70a1a07763c2..d9cfef67e9a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f100e6d0368742ddb8b6b9be986536e63117c05a
+refs/heads/master: 4af3bf6b393a2cec947cd42cc10fc03f5b782484
diff --git a/trunk/arch/arm/include/asm/setup.h b/trunk/arch/arm/include/asm/setup.h
index f2cd18a0932b..ee1304f22f94 100644
--- a/trunk/arch/arm/include/asm/setup.h
+++ b/trunk/arch/arm/include/asm/setup.h
@@ -14,7 +14,7 @@
 #ifndef __ASMARM_SETUP_H
 #define __ASMARM_SETUP_H
 
-#include <asm/types.h>
+#include <linux/types.h>
 
 #define COMMAND_LINE_SIZE 1024