diff options
| author | Tejun Heo <tj@kernel.org> | 2009-08-14 07:41:02 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-08-14 07:45:31 +0200 |
| commit | 384be2b18a5f9475eab9ca2bdfa95cc1a04ef59c (patch) | |
| tree | 04c93f391a1b65c8bf8d7ba8643c07d26c26590a /drivers/vlynq | |
| parent | percpu: add dummy pcpu_lpage_remapped() for !CONFIG_SMP (diff) | |
| parent | percpu: use the right flag for get_vm_area() (diff) | |
| download | linux-384be2b18a5f9475eab9ca2bdfa95cc1a04ef59c.tar.xz linux-384be2b18a5f9475eab9ca2bdfa95cc1a04ef59c.zip | |
Merge branch 'percpu-for-linus' into percpu-for-next
Conflicts:
arch/sparc/kernel/smp_64.c
arch/x86/kernel/cpu/perf_counter.c
arch/x86/kernel/setup_percpu.c
drivers/cpufreq/cpufreq_ondemand.c
mm/percpu.c
Conflicts in core and arch percpu codes are mostly from commit
ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many
num_possible_cpus() with nr_cpu_ids. As for-next branch has moved all
the first chunk allocators into mm/percpu.c, the changes are moved
from arch code to mm/percpu.c.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/vlynq')
| -rw-r--r-- | drivers/vlynq/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/vlynq/vlynq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vlynq/Kconfig b/drivers/vlynq/Kconfig index f6542211db48..a9efb1625321 100644 --- a/drivers/vlynq/Kconfig +++ b/drivers/vlynq/Kconfig @@ -13,7 +13,7 @@ config VLYNQ config VLYNQ_DEBUG bool "VLYNQ bus debug" - depends on VLYNQ && KERNEL_DEBUG + depends on VLYNQ && DEBUG_KERNEL help Turn on VLYNQ bus debugging. diff --git a/drivers/vlynq/vlynq.c b/drivers/vlynq/vlynq.c index 7335433b067b..f05d2a368367 100644 --- a/drivers/vlynq/vlynq.c +++ b/drivers/vlynq/vlynq.c @@ -76,7 +76,7 @@ struct vlynq_regs { u32 int_device[8]; }; -#ifdef VLYNQ_DEBUG +#ifdef CONFIG_VLYNQ_DEBUG static void vlynq_dump_regs(struct vlynq_device *dev) { int i; |