Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299175
b: refs/heads/master
c: 9a5c7d6
h: refs/heads/master
i:
  299173: dfababf
  299171: 39dd632
  299167: d06d8b5
v: v3
  • Loading branch information
Sachin Kamat authored and Grant Likely committed Apr 11, 2012
1 parent 27cd5fc commit 004df1f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 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: 6270d830d030da48eddffbe31ed1e4444f203fc5
refs/heads/master: 9a5c7d6eb9b8cc9fa1c7169ecfd96c9e267c0452
16 changes: 8 additions & 8 deletions trunk/drivers/gpio/gpio-samsung.c
Original file line number Diff line number Diff line change
Expand Up @@ -2382,8 +2382,8 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = {
#endif
};

static struct samsung_gpio_chip exynos5_gpios_1[] = {
#ifdef CONFIG_ARCH_EXYNOS5
static struct samsung_gpio_chip exynos5_gpios_1[] = {
{
.chip = {
.base = EXYNOS5_GPA0(0),
Expand Down Expand Up @@ -2541,11 +2541,11 @@ static struct samsung_gpio_chip exynos5_gpios_1[] = {
.to_irq = samsung_gpiolib_to_irq,
},
},
#endif
};
#endif

static struct samsung_gpio_chip exynos5_gpios_2[] = {
#ifdef CONFIG_ARCH_EXYNOS5
static struct samsung_gpio_chip exynos5_gpios_2[] = {
{
.chip = {
.base = EXYNOS5_GPE0(0),
Expand Down Expand Up @@ -2602,11 +2602,11 @@ static struct samsung_gpio_chip exynos5_gpios_2[] = {

},
},
#endif
};
#endif

static struct samsung_gpio_chip exynos5_gpios_3[] = {
#ifdef CONFIG_ARCH_EXYNOS5
static struct samsung_gpio_chip exynos5_gpios_3[] = {
{
.chip = {
.base = EXYNOS5_GPV0(0),
Expand Down Expand Up @@ -2638,20 +2638,20 @@ static struct samsung_gpio_chip exynos5_gpios_3[] = {
.label = "GPV4",
},
},
#endif
};
#endif

static struct samsung_gpio_chip exynos5_gpios_4[] = {
#ifdef CONFIG_ARCH_EXYNOS5
static struct samsung_gpio_chip exynos5_gpios_4[] = {
{
.chip = {
.base = EXYNOS5_GPZ(0),
.ngpio = EXYNOS5_GPIO_Z_NR,
.label = "GPZ",
},
},
#endif
};
#endif


#if defined(CONFIG_ARCH_EXYNOS) && defined(CONFIG_OF)
Expand Down

0 comments on commit 004df1f

Please sign in to comment.