diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 10:58:27 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 10:58:27 +0000 |
| commit | ec1e20a02fe33b767ffcca8920a32211492416d7 (patch) | |
| tree | 85cfc0bbc1aac672b5ee4d540d1eeb2cc0d96f61 /include | |
| parent | 959f58544b7f20c92d5eb43d1232c96c15c01bfb (diff) | |
| parent | aed3a4ed7222ae37860ae33cbad3ea7a6b2eaf8e (diff) | |
| download | linux-ec1e20a02fe33b767ffcca8920a32211492416d7.tar.bz2 | |
Merge branch 'misc' into for-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/amba/bus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index 43ec7e247a80..b327a1b1b7e8 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -21,7 +21,7 @@ #include <linux/resource.h> #include <linux/regulator/consumer.h> -#define AMBA_NR_IRQS 2 +#define AMBA_NR_IRQS 9 #define AMBA_CID 0xb105f00d struct clk; |