diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-03 11:22:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-03 11:22:06 -0400 |
| commit | cf0223503e6198292cdcc864e01eeb5fe7490752 (patch) | |
| tree | 5ed99ae5fc7a67ec19df19f4b46b0c04d97db174 /arch/sh/kernel/topology.c | |
| parent | 3f8ddb032afa729d4bad1bf2965d3ec068de6b72 (diff) | |
| parent | e857bfd4604a3a4edaf9c7038db880d9f78aecbd (diff) | |
Merge branch 'sh-latest' of git://github.com/pmundt/linux-sh
* 'sh-latest' of git://github.com/pmundt/linux-sh:
sh: Add default uImage rule for sh7757lcr
sh: modify the asm/sh_eth.h to linux/sh_eth.h in sh7757lcr
sh: userimask.c needs linux/stat.h
sh: pfc: Add GPIO IRQ support
sh: modify the asm/sh_eth.h to linux/sh_eth.h in some boards
sh: pfc: Remove unused gpio_in_use member
sh: add parameters for EHCI and RIIC in clock-sh7757.c
sh: kexec: Add PHYSICAL_START
SH: irq: Remove IRQF_DISABLED
sh: pfc: get_config_reg() shift clean up
sh: intc: Add IRQ trigger bit field check
sh: drop unused Kconfig symbol
sh: Fix implicit declaration of function numa_node_id
sh: kexec: Register crashk_res
sh: ecovec: add renesas_usbhs DMAEngine support
Diffstat (limited to 'arch/sh/kernel/topology.c')
| -rw-r--r-- | arch/sh/kernel/topology.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c index 38e862852dd0..ecc2d3d0f54a 100644 --- a/arch/sh/kernel/topology.c +++ b/arch/sh/kernel/topology.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/cpumask.h> | 11 | #include <linux/cpumask.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/percpu.h> | 13 | #include <linux/percpu.h> |
| 14 | #include <linux/topology.h> | ||
| 14 | #include <linux/node.h> | 15 | #include <linux/node.h> |
| 15 | #include <linux/nodemask.h> | 16 | #include <linux/nodemask.h> |
| 16 | 17 | ||