diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-21 14:38:51 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-21 14:38:51 -0700 |
| commit | ac185bdc02c216040f3b83f654d864bd8a29cedc (patch) | |
| tree | 7cc59ba443f3fc52d329437949436b5b37f1d7ea /include | |
| parent | ae298c98e5ab5bab3b39ffe0c2aebfeb4b1e68a2 (diff) | |
| parent | ba9b5d76372dc290b6ca04dad93927a22c2ac49a (diff) | |
| download | linux-ac185bdc02c216040f3b83f654d864bd8a29cedc.tar.gz linux-ac185bdc02c216040f3b83f654d864bd8a29cedc.tar.bz2 linux-ac185bdc02c216040f3b83f654d864bd8a29cedc.zip | |
Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/dma.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/procinfo.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-s3c2410/dma.h b/include/asm-arm/arch-s3c2410/dma.h index 72964f9b8414..7463fd5252ce 100644 --- a/include/asm-arm/arch-s3c2410/dma.h +++ b/include/asm-arm/arch-s3c2410/dma.h @@ -104,6 +104,7 @@ enum s3c2410_chan_op_e { S3C2410_DMAOP_RESUME, S3C2410_DMAOP_FLUSH, S3C2410_DMAOP_TIMEOUT, /* internal signal to handler */ + S3C2410_DMAOP_STARTED, /* indicate channel started */ }; typedef enum s3c2410_chan_op_e s3c2410_chan_op_t; diff --git a/include/asm-arm/procinfo.h b/include/asm-arm/procinfo.h index edb7b6502fcf..91a31adfa8a8 100644 --- a/include/asm-arm/procinfo.h +++ b/include/asm-arm/procinfo.h @@ -55,5 +55,6 @@ extern unsigned int elf_hwcap; #define HWCAP_VFP 64 #define HWCAP_EDSP 128 #define HWCAP_JAVA 256 +#define HWCAP_IWMMXT 512 #endif |