diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-10 09:23:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-10 09:23:29 -0400 |
| commit | 7063c88c726a704e648ba36ca78baa630f8b7b0a (patch) | |
| tree | e5bfd784a7d34a5c04005fa4169986921f9fdcd1 /arch/arm/mach-omap2/board-overo.c | |
| parent | f4b9a988685da6386d7f9a72df3098bcc3270526 (diff) | |
| parent | 4177662ec9f5e50b69ef074369fdb429dd48d97e (diff) | |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/mach-omap2/board-overo.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index dff5528fbfb5..fec1bb19b9ff 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
| @@ -146,7 +146,7 @@ static struct platform_device overo_smsc911x_device = { | |||
| 146 | .name = "smsc911x", | 146 | .name = "smsc911x", |
| 147 | .id = -1, | 147 | .id = -1, |
| 148 | .num_resources = ARRAY_SIZE(overo_smsc911x_resources), | 148 | .num_resources = ARRAY_SIZE(overo_smsc911x_resources), |
| 149 | .resource = &overo_smsc911x_resources, | 149 | .resource = overo_smsc911x_resources, |
| 150 | .dev = { | 150 | .dev = { |
| 151 | .platform_data = &overo_smsc911x_config, | 151 | .platform_data = &overo_smsc911x_config, |
| 152 | }, | 152 | }, |