OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5cbee14
c88a79a
)
Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesa...
author
Olof Johansson
<olof@lixom.net>
Wed, 5 Sep 2012 22:35:48 +0000
(15:35 -0700)
committer
Olof Johansson
<olof@lixom.net>
Wed, 5 Sep 2012 22:35:48 +0000
(15:35 -0700)
* 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: mach-shmobile: Add compilation support for dtbs using 'make dtbs'
+ sync to 3.6-rc3
1
2
drivers/gpio/gpio-pxa.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpio/gpio-pxa.c
index
db5c295
,
9cac88a
..
9528779
---
1
/
drivers/gpio/gpio-pxa.c
---
2
/
drivers/gpio/gpio-pxa.c
+++ b/
drivers/gpio/gpio-pxa.c
@@@
-464,12
-530,12
+489,12
@@@
static int pxa_irq_domain_map(struct ir
const struct irq_domain_ops pxa_irq_domain_ops = {
.map = pxa_irq_domain_map,
+ .xlate = irq_domain_xlate_twocell,
};
- #ifdef CONFIG_OF
static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev)
{
- int ret, nr_banks, nr_gpios
, irq_base
;
+ int ret, nr_banks, nr_gpios;
struct device_node *prev, *next, *np = pdev->dev.of_node;
const struct of_device_id *of_id =
of_match_device(pxa_gpio_dt_ids, &pdev->dev);