diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/arm/mach-s3c6410/setup-sdhci.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'arch/arm/mach-s3c6410/setup-sdhci.c')
| -rw-r--r-- | arch/arm/mach-s3c6410/setup-sdhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c6410/setup-sdhci.c b/arch/arm/mach-s3c6410/setup-sdhci.c index 20666f3bd478..816d2d9f9ef8 100644 --- a/arch/arm/mach-s3c6410/setup-sdhci.c +++ b/arch/arm/mach-s3c6410/setup-sdhci.c | |||
| @@ -30,7 +30,7 @@ char *s3c6410_hsmmc_clksrcs[4] = { | |||
| 30 | [0] = "hsmmc", | 30 | [0] = "hsmmc", |
| 31 | [1] = "hsmmc", | 31 | [1] = "hsmmc", |
| 32 | [2] = "mmc_bus", | 32 | [2] = "mmc_bus", |
| 33 | /* [3] = "48m", - note not succesfully used yet */ | 33 | /* [3] = "48m", - note not successfully used yet */ |
| 34 | }; | 34 | }; |
| 35 | 35 | ||
| 36 | 36 | ||