diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:08 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:08 -0400 |
| commit | ff1b8ba01dc80da338890a187c112fdd3c0b9202 (patch) | |
| tree | 415999aa2c3ac52e48c2b6f690bba393e3d7a00c /arch/arm/mach-s3c2410/mach-n30.c | |
| parent | 5fcdb16bd04fdeb313ee33bb269b04e59a9abf91 (diff) | |
| parent | 32b6cb3872883861f3a2669cce880f3a7ef8979a (diff) | |
ARM: Merge for-2635/gpio2
Merge branch 'for-2635/gpio2' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-n30.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-n30.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c index 9e2565ad973d..41f299d983eb 100644 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c | |||
| @@ -596,6 +596,9 @@ static void __init n30_init(void) | |||
| 596 | 596 | ||
| 597 | platform_add_devices(n35_devices, ARRAY_SIZE(n35_devices)); | 597 | platform_add_devices(n35_devices, ARRAY_SIZE(n35_devices)); |
| 598 | } | 598 | } |
| 599 | |||
| 600 | WARN_ON(gpio_request(S3C2410_GPB(3), "udc pup")); | ||
| 601 | gpio_direction_output(S3C2410_GPB(3), 0); | ||
| 599 | } | 602 | } |
| 600 | 603 | ||
| 601 | MACHINE_START(N30, "Acer-N30") | 604 | MACHINE_START(N30, "Acer-N30") |