diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 12:24:31 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 12:24:31 +0300 |
| commit | 0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch) | |
| tree | df997d1cfb0786427a0df1fbd6f0640fa4248cf4 /arch/arm/mach-sa1100/generic.c | |
| parent | a23ce6da9677d245aa0aadc99f4197030350ab54 (diff) | |
| parent | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (diff) | |
| download | linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.xz | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/arm/mach-sa1100/generic.c')
| -rw-r--r-- | arch/arm/mach-sa1100/generic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index 59d14f0fdcf8..e21f3470eece 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c @@ -21,7 +21,6 @@ #include <asm/div64.h> #include <mach/hardware.h> #include <asm/system.h> -#include <asm/pgtable.h> #include <asm/mach/map.h> #include <asm/mach/flash.h> #include <asm/irq.h> |