diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-11 01:29:42 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-11 01:29:42 +0200 |
| commit | c3738d6c639dbe1ec170666d76a1c1372ff77c0b (patch) | |
| tree | e31a47eb137e16c3cf736a2e6127b1eaf923fff5 | |
| parent | 44a113e490ed001a07fefe4e26f0a2415c609e06 (diff) | |
| parent | fcc39587bde591898b5e435a1c859f368f0c1e93 (diff) | |
Merge branch 'gta02-machine-devices-2.6.31' into om-gta02-2.6.31
| -rw-r--r-- | arch/arm/mach-s3c2442/mach-gta02.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index 7122114c517..8b52a26f7c2 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -274,8 +274,8 @@ static struct resource gta02_glamo_resources[] = { .flags = IORESOURCE_IRQ, }, [2] = { - .start = GTA02_GPIO_3D_RESET, - .end = GTA02_GPIO_3D_RESET, + .start = S3C2410_BOARD_IRQ_START, + .flags = IORESOURCE_IRQ, }, }; |