hand merge

6508e77c · Patrick Mochel · be9e929d · 6508e77c
Commit 6508e77c authored Jun 10, 2003 by Patrick Mochel
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/base/cpu.c drivers/base/cpu.c +1 -1

No files found.
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -6,8 +6,8 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/cpu.h>
+#include <linux/topology.h>

-#include <asm/topology.h>

 struct sysdev_class cpu_sysdev_class = {
 	set_kset_name("cpu"),