Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344951
b: refs/heads/master
c: 8ae754e
h: refs/heads/master
i:
  344949: 4dd79b4
  344947: f36f757
  344943: dab0914
v: v3
  • Loading branch information
Lee Jones authored and Samuel Ortiz committed Nov 11, 2012
1 parent e353408 commit ed40039
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 37 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aec17ea1ee78923f1287c18e9905c19e4dfd9c64
refs/heads/master: 8ae754ebd5edffa0b2a2bafa4879a9ace01d5477
36 changes: 0 additions & 36 deletions trunk/drivers/mfd/ab8500-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -591,38 +591,6 @@ int ab8500_suspend(struct ab8500 *ab8500)
return 0;
}

/* AB8500 GPIO Resources */
static struct resource __devinitdata ab8500_gpio_resources[] = {
{
.name = "GPIO_INT6",
.start = AB8500_INT_GPIO6R,
.end = AB8500_INT_GPIO41F,
.flags = IORESOURCE_IRQ,
}
};

/* AB9540 GPIO Resources */
static struct resource __devinitdata ab9540_gpio_resources[] = {
{
.name = "GPIO_INT6",
.start = AB8500_INT_GPIO6R,
.end = AB8500_INT_GPIO41F,
.flags = IORESOURCE_IRQ,
},
{
.name = "GPIO_INT14",
.start = AB9540_INT_GPIO50R,
.end = AB9540_INT_GPIO54R,
.flags = IORESOURCE_IRQ,
},
{
.name = "GPIO_INT15",
.start = AB9540_INT_GPIO50F,
.end = AB9540_INT_GPIO54F,
.flags = IORESOURCE_IRQ,
}
};

static struct resource __devinitdata ab8500_gpadc_resources[] = {
{
.name = "HW_CONV_END",
Expand Down Expand Up @@ -1065,8 +1033,6 @@ static struct mfd_cell __devinitdata ab8500_devs[] = {
{
.name = "ab8500-gpio",
.of_compatible = "stericsson,ab8500-gpio",
.num_resources = ARRAY_SIZE(ab8500_gpio_resources),
.resources = ab8500_gpio_resources,
},
{
.name = "ab8500-usb",
Expand All @@ -1083,8 +1049,6 @@ static struct mfd_cell __devinitdata ab8500_devs[] = {
static struct mfd_cell __devinitdata ab9540_devs[] = {
{
.name = "ab8500-gpio",
.num_resources = ARRAY_SIZE(ab9540_gpio_resources),
.resources = ab9540_gpio_resources,
},
{
.name = "ab9540-usb",
Expand Down

0 comments on commit ed40039

Please sign in to comment.