diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 21:31:56 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 21:31:56 +0100 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /include/asm-blackfin/serial.h | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
| download | linux-next-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.tar.gz linux-next-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.zip | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'include/asm-blackfin/serial.h')
| -rw-r--r-- | include/asm-blackfin/serial.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-blackfin/serial.h b/include/asm-blackfin/serial.h deleted file mode 100644 index 994dd869558c..000000000000 --- a/include/asm-blackfin/serial.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * include/asm-blackfin/serial.h - */ - -#define SERIAL_EXTRA_IRQ_FLAGS IRQF_TRIGGER_HIGH |