diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-30 05:47:55 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-30 05:47:55 -0400 |
| commit | 0a52ac8d181e938d640c2da70cad6d1301abe775 (patch) | |
| tree | 046edf3437a49d3f6989d152bd94fcc80906b86d /arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | |
| parent | e81b795d44ba04beab7714de65ed2e377823bd37 (diff) | |
| parent | 9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd (diff) | |
Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c')
| -rw-r--r-- | arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c index 153f57c57b6..c259786e7fa 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c +++ b/arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #define CI(c, p) { ci->c = PVR_##p(pvr); } | 23 | #define CI(c, p) { ci->c = PVR_##p(pvr); } |
| 24 | #define err_printk(x) \ | 24 | #define err_printk(x) \ |
| 25 | early_printk("ERROR: Microblaze " x " - different for PVR and DTS\n"); | 25 | early_printk("ERROR: Microblaze " x "-different for PVR and DTS\n"); |
| 26 | 26 | ||
| 27 | void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu) | 27 | void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu) |
| 28 | { | 28 | { |