From f1cd080423e94f464e3e3ce572e55a592e51aa8c Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 15 Jan 2013 16:37:56 +0000 Subject: [PATCH] --- yaml --- r: 350536 b: refs/heads/master c: 710a03e9349f027cf2d77559973fc06076a4042a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/board-mop500.c | 1 - trunk/include/linux/mfd/abx500/ab8500-gpio.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 913f6640fb85..f0a2ccc3d426 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43a255dba132c1783f4ca16b528d55e55b4b4d83 +refs/heads/master: 710a03e9349f027cf2d77559973fc06076a4042a diff --git a/trunk/arch/arm/mach-ux500/board-mop500.c b/trunk/arch/arm/mach-ux500/board-mop500.c index b6f14ee507ca..b8781caa54b8 100644 --- a/trunk/arch/arm/mach-ux500/board-mop500.c +++ b/trunk/arch/arm/mach-ux500/board-mop500.c @@ -92,7 +92,6 @@ static struct platform_device snowball_gpio_en_3v3_regulator_dev = { static struct abx500_gpio_platform_data ab8500_gpio_pdata = { .gpio_base = MOP500_AB8500_PIN_GPIO(1), - .irq_base = MOP500_AB8500_VIR_GPIO_IRQ_BASE, }; /* ab8500-codec */ diff --git a/trunk/include/linux/mfd/abx500/ab8500-gpio.h b/trunk/include/linux/mfd/abx500/ab8500-gpio.h index e8c8281e194a..172b2f201ae0 100644 --- a/trunk/include/linux/mfd/abx500/ab8500-gpio.h +++ b/trunk/include/linux/mfd/abx500/ab8500-gpio.h @@ -16,7 +16,6 @@ struct abx500_gpio_platform_data { int gpio_base; - u32 irq_base; }; enum abx500_gpio_pull_updown {