diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 10:12:41 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 10:12:41 -0700 |
commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /arch/arm/mach-omap2/board-zoom-debugboard.c | |
parent | 30ba3ead05763b172acaa65ae1be71af2a878940 (diff) | |
parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
download | kernel_samsung_smdk4412-8d0bc2b456103a34c11e01305cd1aed1cde579e5.tar.gz kernel_samsung_smdk4412-8d0bc2b456103a34c11e01305cd1aed1cde579e5.tar.bz2 kernel_samsung_smdk4412-8d0bc2b456103a34c11e01305cd1aed1cde579e5.zip |
Merge commit 'v2.6.34' into next
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom-debugboard.c')
-rw-r--r-- | arch/arm/mach-omap2/board-zoom-debugboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index bb4018b6064..e15d2e87cfc 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c @@ -96,7 +96,7 @@ static struct plat_serial8250_port serial_platform_data[] = { static struct platform_device zoom_debugboard_serial_device = { .name = "serial8250", - .id = 3, + .id = PLAT8250_DEV_PLATFORM, .dev = { .platform_data = serial_platform_data, }, |