diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
| commit | 94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch) | |
| tree | 5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /arch/arm/mach-sa1100/collie.c | |
| parent | 3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff) | |
| parent | 1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'arch/arm/mach-sa1100/collie.c')
| -rw-r--r-- | arch/arm/mach-sa1100/collie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 7fd6e29c36b7..522abc036d3a 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/tty.h> | 22 | #include <linux/tty.h> |
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/mtd/mtd.h> | 25 | #include <linux/mtd/mtd.h> |
| 26 | #include <linux/mtd/partitions.h> | 26 | #include <linux/mtd/partitions.h> |
| 27 | #include <linux/timer.h> | 27 | #include <linux/timer.h> |