From dd97aa337f88469b4e959df2e0c794bc9d41931d Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Mon, 13 Feb 2012 11:26:25 +0100 Subject: [PATCH] --- yaml --- r: 296193 b: refs/heads/master c: 5bc067b71928d3f470d051847aefa55724fd0c95 h: refs/heads/master i: 296191: 1f2fc871a92d512db329872f60726f7eda70dc9e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/gpio.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b4802dcb73fa..e27cc55f8c3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21f81872788b8089ec4214afad8fc6a0a23f70c8 +refs/heads/master: 5bc067b71928d3f470d051847aefa55724fd0c95 diff --git a/trunk/arch/arm/mach-at91/gpio.c b/trunk/arch/arm/mach-at91/gpio.c index 89e683aaae6c..0dc3f5ead7bb 100644 --- a/trunk/arch/arm/mach-at91/gpio.c +++ b/trunk/arch/arm/mach-at91/gpio.c @@ -496,12 +496,17 @@ postcore_initcall(at91_gpio_debugfs_init); static void __init at91_gpio_irqdomain(struct at91_gpio_chip *at91_gpio) { int irq_base; +#if defined(CONFIG_OF) + struct device_node *of_node = at91_gpio->chip.of_node; +#else + struct device_node *of_node = NULL; +#endif irq_base = irq_alloc_descs(-1, 0, at91_gpio->chip.ngpio, 0); if (irq_base < 0) panic("at91_gpio.%d: error %d: couldn't allocate IRQ numbers.\n", at91_gpio->pioc_idx, irq_base); - at91_gpio->domain = irq_domain_add_legacy(at91_gpio->chip.of_node, + at91_gpio->domain = irq_domain_add_legacy(of_node, at91_gpio->chip.ngpio, irq_base, 0, &irq_domain_simple_ops, NULL);