diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /arch/arm/plat-s3c24xx/cpu.c | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'arch/arm/plat-s3c24xx/cpu.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/cpu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index 76d0858c3cbb..4a10c0f684b2 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c | |||
| @@ -88,7 +88,7 @@ static struct cpu_table cpu_ids[] __initdata = { | |||
| 88 | { | 88 | { |
| 89 | .idcode = 0x32440000, | 89 | .idcode = 0x32440000, |
| 90 | .idmask = 0xffffffff, | 90 | .idmask = 0xffffffff, |
| 91 | .map_io = s3c244x_map_io, | 91 | .map_io = s3c2440_map_io, |
| 92 | .init_clocks = s3c244x_init_clocks, | 92 | .init_clocks = s3c244x_init_clocks, |
| 93 | .init_uarts = s3c244x_init_uarts, | 93 | .init_uarts = s3c244x_init_uarts, |
| 94 | .init = s3c2440_init, | 94 | .init = s3c2440_init, |
| @@ -97,7 +97,7 @@ static struct cpu_table cpu_ids[] __initdata = { | |||
| 97 | { | 97 | { |
| 98 | .idcode = 0x32440001, | 98 | .idcode = 0x32440001, |
| 99 | .idmask = 0xffffffff, | 99 | .idmask = 0xffffffff, |
| 100 | .map_io = s3c244x_map_io, | 100 | .map_io = s3c2440_map_io, |
| 101 | .init_clocks = s3c244x_init_clocks, | 101 | .init_clocks = s3c244x_init_clocks, |
| 102 | .init_uarts = s3c244x_init_uarts, | 102 | .init_uarts = s3c244x_init_uarts, |
| 103 | .init = s3c2440_init, | 103 | .init = s3c2440_init, |
| @@ -106,7 +106,7 @@ static struct cpu_table cpu_ids[] __initdata = { | |||
| 106 | { | 106 | { |
| 107 | .idcode = 0x32440aaa, | 107 | .idcode = 0x32440aaa, |
| 108 | .idmask = 0xffffffff, | 108 | .idmask = 0xffffffff, |
| 109 | .map_io = s3c244x_map_io, | 109 | .map_io = s3c2442_map_io, |
| 110 | .init_clocks = s3c244x_init_clocks, | 110 | .init_clocks = s3c244x_init_clocks, |
| 111 | .init_uarts = s3c244x_init_uarts, | 111 | .init_uarts = s3c244x_init_uarts, |
| 112 | .init = s3c2442_init, | 112 | .init = s3c2442_init, |
| @@ -115,7 +115,7 @@ static struct cpu_table cpu_ids[] __initdata = { | |||
| 115 | { | 115 | { |
| 116 | .idcode = 0x32440aab, | 116 | .idcode = 0x32440aab, |
| 117 | .idmask = 0xffffffff, | 117 | .idmask = 0xffffffff, |
| 118 | .map_io = s3c244x_map_io, | 118 | .map_io = s3c2442_map_io, |
| 119 | .init_clocks = s3c244x_init_clocks, | 119 | .init_clocks = s3c244x_init_clocks, |
| 120 | .init_uarts = s3c244x_init_uarts, | 120 | .init_uarts = s3c244x_init_uarts, |
| 121 | .init = s3c2442_init, | 121 | .init = s3c2442_init, |