diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-05-14 09:29:52 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-14 09:29:52 -0400 |
| commit | 23e117fa44429cc054cb27d5621d64e4ced91e52 (patch) | |
| tree | a4b9d0902b9c6f009b2c297515221c1b9bed3af8 /arch/arm/mach-omap2/board-zoom-debugboard.c | |
| parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
| parent | a93d2f1744206827ccf416e2cdc5018aa503314e (diff) | |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-4
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 bb4018b60642..e15d2e87cfc1 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[] = { | |||
| 96 | 96 | ||
| 97 | static struct platform_device zoom_debugboard_serial_device = { | 97 | static struct platform_device zoom_debugboard_serial_device = { |
| 98 | .name = "serial8250", | 98 | .name = "serial8250", |
| 99 | .id = 3, | 99 | .id = PLAT8250_DEV_PLATFORM, |
| 100 | .dev = { | 100 | .dev = { |
| 101 | .platform_data = serial_platform_data, | 101 | .platform_data = serial_platform_data, |
| 102 | }, | 102 | }, |