diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/arm/mach-at91rm9200/board-kb9202.c | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/arm/mach-at91rm9200/board-kb9202.c')
| -rw-r--r-- | arch/arm/mach-at91rm9200/board-kb9202.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91rm9200/board-kb9202.c b/arch/arm/mach-at91rm9200/board-kb9202.c index 35a954a44b1b..759d8191854f 100644 --- a/arch/arm/mach-at91rm9200/board-kb9202.c +++ b/arch/arm/mach-at91rm9200/board-kb9202.c | |||
| @@ -84,7 +84,7 @@ static struct at91_udc_data __initdata kb9202_udc_data = { | |||
| 84 | 84 | ||
| 85 | static struct at91_mmc_data __initdata kb9202_mmc_data = { | 85 | static struct at91_mmc_data __initdata kb9202_mmc_data = { |
| 86 | .det_pin = AT91_PIN_PB2, | 86 | .det_pin = AT91_PIN_PB2, |
| 87 | .is_b = 0, | 87 | .slot_b = 0, |
| 88 | .wire4 = 1, | 88 | .wire4 = 1, |
| 89 | }; | 89 | }; |
| 90 | 90 | ||