diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /arch/arm/mach-sa1100 | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/cpu-sa1110.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c index 90a4130114a6..78f4c1346044 100644 --- a/arch/arm/mach-sa1100/cpu-sa1110.c +++ b/arch/arm/mach-sa1100/cpu-sa1110.c | |||
| @@ -83,7 +83,7 @@ static struct sdram_params sdram_tbl[] __initdata = { | |||
| 83 | .refresh = 64000, | 83 | .refresh = 64000, |
| 84 | .cas_latency = 3, | 84 | .cas_latency = 3, |
| 85 | }, { /* Samsung K4S281632B-1H */ | 85 | }, { /* Samsung K4S281632B-1H */ |
| 86 | .name = "K4S281632b-1H", | 86 | .name = "K4S281632B-1H", |
| 87 | .rows = 12, | 87 | .rows = 12, |
| 88 | .tck = 10, | 88 | .tck = 10, |
| 89 | .trp = 20, | 89 | .trp = 20, |