git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
include
/
mach
/
dma.h
diff --git
a/arch/arm/mach-s3c2410/include/mach/dma.h
b/arch/arm/mach-s3c2410/include/mach/dma.h
index
1648311
..
c3a2629
100644
(file)
--- a/
arch/arm/mach-s3c2410/include/mach/dma.h
+++ b/
arch/arm/mach-s3c2410/include/mach/dma.h
@@
-55,9
+55,9
@@
enum dma_ch {
/* we have 4 dma channels */
#ifndef CONFIG_CPU_S3C2443
/* we have 4 dma channels */
#ifndef CONFIG_CPU_S3C2443
-#define S3C
2410_DMA_CHANNELS
(4)
+#define S3C
_DMA_CHANNELS
(4)
#else
#else
-#define S3C
2410_DMA_CHANNELS
(6)
+#define S3C
_DMA_CHANNELS
(6)
#endif
/* types */
#endif
/* types */
@@
-192,10
+192,6
@@
struct s3c2410_dma_chan {
struct sys_device dev;
};
struct sys_device dev;
};
-/* the currently allocated channel information */
-extern struct s3c2410_dma_chan s3c2410_chans[];
-
-/* note, we don't really use dma_device_t at the moment */
typedef unsigned long dma_device_t;
#endif /* __ASM_ARCH_DMA_H */
typedef unsigned long dma_device_t;
#endif /* __ASM_ARCH_DMA_H */