diff options
| author | Linus Torvalds | 2011-01-26 00:00:17 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-01-26 00:00:17 +0100 |
| commit | fd3830b379b87b9a47d796d79d1e41f73e1973fa (patch) | |
| tree | 92ea342d373631befab5e467b53b9bf374e49f81 /arch/sh/kernel | |
| parent | KEYS: Fix __key_link_end() quota fixup on error (diff) | |
| parent | sh: Fix build of sh7750 base boards (diff) | |
| download | kernel-qcow2-linux-fd3830b379b87b9a47d796d79d1e41f73e1973fa.tar.gz kernel-qcow2-linux-fd3830b379b87b9a47d796d79d1e41f73e1973fa.tar.xz kernel-qcow2-linux-fd3830b379b87b9a47d796d79d1e41f73e1973fa.zip | |
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix build of sh7750 base boards
sh: update INTC to clear IRQ sense valid flag
sh: Fix sh build failure when CONFIG_SFC=m
sh: fix MSIOF0 SPI on ecovec: it conflicts with VOU
sh: support XZ-compressed kernel.
sh: Fix up breakage from asm-generic/pgtable.h changes.
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7750.c | 6 | ||||
| -rw-r--r-- | arch/sh/kernel/topology.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c index c2b0aaaedcae..672944f5b19c 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c @@ -230,10 +230,10 @@ static struct platform_device *sh7750_devices[] __initdata = { static int __init sh7750_devices_setup(void) { if (mach_is_rts7751r2d()) { - platform_register_device(&scif_device); + platform_device_register(&scif_device); } else { - platform_register_device(&sci_device); - platform_register_device(&scif_device); + platform_device_register(&sci_device); + platform_device_register(&scif_device); } return platform_add_devices(sh7750_devices, diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c index 948fdb656933..38e862852dd0 100644 --- a/arch/sh/kernel/topology.c +++ b/arch/sh/kernel/topology.c @@ -17,6 +17,7 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices); cpumask_t cpu_core_map[NR_CPUS]; +EXPORT_SYMBOL(cpu_core_map); static cpumask_t cpu_coregroup_map(unsigned int cpu) { |