diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-09 03:49:58 +0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-09 04:14:15 +0400 |
| commit | d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1 (patch) | |
| tree | e2b4bb46fa00f0ad20447e40dba6fb21a4ae0815 /arch/arm/mach-kirkwood/include/mach/irqs.h | |
| parent | c9243f5bdd6637b2bb7dc254b54d9edf957ef17e (diff) | |
| parent | 45d7f32c7a43cbb9592886d38190e379e2eb2226 (diff) | |
| download | linux-d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1.tar.xz | |
Merge commit 'linus/master' into bkl/core
Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.
Diffstat (limited to 'arch/arm/mach-kirkwood/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/irqs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h index f00a0a45a67e..9da2eb59180b 100644 --- a/arch/arm/mach-kirkwood/include/mach/irqs.h +++ b/arch/arm/mach-kirkwood/include/mach/irqs.h @@ -23,6 +23,7 @@ #define IRQ_KIRKWOOD_XOR_10 7 #define IRQ_KIRKWOOD_XOR_11 8 #define IRQ_KIRKWOOD_PCIE 9 +#define IRQ_KIRKWOOD_PCIE1 10 #define IRQ_KIRKWOOD_GE00_SUM 11 #define IRQ_KIRKWOOD_GE01_SUM 15 #define IRQ_KIRKWOOD_USB 19 |