diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-30 16:24:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-30 16:24:43 -0800 |
| commit | c290b2f2b0187b5cd840b2c2803107a0207ebc2f (patch) | |
| tree | f4751d34d041e7ed5a30d5c69cdb03de898a6238 | |
| parent | d6e92d360c21494ed4ce3bcfa7c84b90cb075bba (diff) | |
| parent | e43fce14088d9910b545c30c9a7127deb289d477 (diff) | |
| download | linux-3.10-c290b2f2b0187b5cd840b2c2803107a0207ebc2f.tar.gz linux-3.10-c290b2f2b0187b5cd840b2c2803107a0207ebc2f.tar.bz2 linux-3.10-c290b2f2b0187b5cd840b2c2803107a0207ebc2f.zip | |
Merge branch 'dt-for-linus' of git://sources.calxeda.com/kernel/linux
* 'dt-for-linus' of git://sources.calxeda.com/kernel/linux:
of: Add Silicon Image vendor prefix
of/irq: of_irq_init: add check for parent equal to child node
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 | ||||
| -rw-r--r-- | drivers/of/irq.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index e8552782b44..874921e9780 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -33,6 +33,7 @@ qcom Qualcomm, Inc. ramtron Ramtron International samsung Samsung Semiconductor schindler Schindler +sil Silicon Image simtek sirf SiRF Technology, Inc. stericsson ST-Ericsson diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 791270b8bd1..19c0115092d 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -424,6 +424,8 @@ void __init of_irq_init(const struct of_device_id *matches) desc->dev = np; desc->interrupt_parent = of_irq_find_parent(np); + if (desc->interrupt_parent == np) + desc->interrupt_parent = NULL; list_add_tail(&desc->list, &intc_desc_list); } |