diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-18 22:15:30 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-18 22:15:30 +0000 |
| commit | fdb0a1a67e131f07a308730c80d07e330211d2e0 (patch) | |
| tree | 4fbf35055fc965737c1ffdbcfe98d7ea8335f940 /arch/arm/plat-s3c24xx/dma.c | |
| parent | fc0b7a20368193e1f7cf1376624eed419b9c33e6 (diff) | |
| parent | 7bb56d01f111890414fbe35412698485b68ed468 (diff) | |
| download | op-kernel-dev-fdb0a1a67e131f07a308730c80d07e330211d2e0.zip op-kernel-dev-fdb0a1a67e131f07a308730c80d07e330211d2e0.tar.gz | |
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/plat-s3c24xx/dma.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/dma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index 63bb22b..aee2aeb 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c @@ -25,7 +25,6 @@ #include <linux/sysdev.h> #include <linux/slab.h> #include <linux/errno.h> -#include <linux/delay.h> #include <linux/io.h> #include <asm/system.h> |
