diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 08:39:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 08:39:56 -0700 |
| commit | 1dd465cac8d3ba18a9840d032f6604147269c031 (patch) | |
| tree | 78f00fdeae26d018def75e7517aa50e56f4994df /arch/arm/plat-omap/common.c | |
| parent | a2218cac0aacecbecebd3cabc43cc8a4a09cecbb (diff) | |
| parent | 217874feed0d3a6543a6b7127782f4a08bffd731 (diff) | |
| download | kernel-crypto-1dd465cac8d3ba18a9840d032f6604147269c031.tar.gz kernel-crypto-1dd465cac8d3ba18a9840d032f6604147269c031.tar.xz kernel-crypto-1dd465cac8d3ba18a9840d032f6604147269c031.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/plat-omap/common.c')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 6cb20aea7f5..02bcc6c1cd1 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -25,7 +25,6 @@ #include <asm/mach/map.h> #include <asm/hardware/clock.h> #include <asm/io.h> -#include <asm/mach-types.h> #include <asm/setup.h> #include <asm/arch/board.h> |