diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 05:35:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 05:35:33 -0500 |
| commit | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch) | |
| tree | 794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /arch/arm/mach-pxa/csb726.c | |
| parent | e28edb723e64200554194da17617ee6e82de6690 (diff) | |
| parent | 677f4f64e4b2336682f0e15c69b206ade6f6b131 (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-pxa/csb726.c')
| -rw-r--r-- | arch/arm/mach-pxa/csb726.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/csb726.c b/arch/arm/mach-pxa/csb726.c index 965480eb4fe6..88575b87bd33 100644 --- a/arch/arm/mach-pxa/csb726.c +++ b/arch/arm/mach-pxa/csb726.c | |||
| @@ -268,6 +268,9 @@ static void __init csb726_init(void) | |||
| 268 | /* MSC2 = 0x06697ff4; *//* none/SM501 */ | 268 | /* MSC2 = 0x06697ff4; *//* none/SM501 */ |
| 269 | MSC2 = (MSC2 & ~0xffff) | 0x7ff4; /* SM501 */ | 269 | MSC2 = (MSC2 & ~0xffff) | 0x7ff4; /* SM501 */ |
| 270 | 270 | ||
| 271 | pxa_set_ffuart_info(NULL); | ||
| 272 | pxa_set_btuart_info(NULL); | ||
| 273 | pxa_set_stuart_info(NULL); | ||
| 271 | pxa_set_i2c_info(NULL); | 274 | pxa_set_i2c_info(NULL); |
| 272 | pxa27x_set_i2c_power_info(NULL); | 275 | pxa27x_set_i2c_power_info(NULL); |
| 273 | pxa_set_mci_info(&csb726_mci); | 276 | pxa_set_mci_info(&csb726_mci); |