aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/jornada720.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-01 23:20:55 -0500
committerPaul Mackerras <paulus@samba.org>2005-11-01 23:20:55 -0500
commitde2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch)
treedfccb1a2717a8a042a87dbade509f894810ea1cd /arch/arm/mach-sa1100/jornada720.c
parent104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff)
parentdf70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff)
Merge ../linux-2.6
Diffstat (limited to 'arch/arm/mach-sa1100/jornada720.c')
-rw-r--r--arch/arm/mach-sa1100/jornada720.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 89af0c831e8f..2f671cc3cb99 100644
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -6,7 +6,7 @@
6#include <linux/kernel.h> 6#include <linux/kernel.h>
7#include <linux/tty.h> 7#include <linux/tty.h>
8#include <linux/delay.h> 8#include <linux/delay.h>
9#include <linux/device.h> 9#include <linux/platform_device.h>
10#include <linux/ioport.h> 10#include <linux/ioport.h>
11#include <linux/mtd/mtd.h> 11#include <linux/mtd/mtd.h>
12#include <linux/mtd/partitions.h> 12#include <linux/mtd/partitions.h>