aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-integrator/smp.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-18 11:30:38 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-18 11:30:38 -0500
commit79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb (patch)
treefaf5312c25eebfa11bd1f65c881bfac07c945f2b /include/asm-arm/arch-integrator/smp.h
parent67cb6e842e7f1e534a5e0e8708a8779e33b60520 (diff)
parentfc71fe40d2bedcc57d3406bf2050481f8b3441b6 (diff)
Merge branch 'master'
Diffstat (limited to 'include/asm-arm/arch-integrator/smp.h')
-rw-r--r--include/asm-arm/arch-integrator/smp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-integrator/smp.h b/include/asm-arm/arch-integrator/smp.h
index 0ec7093f7c3..da6981efdc3 100644
--- a/include/asm-arm/arch-integrator/smp.h
+++ b/include/asm-arm/arch-integrator/smp.h
@@ -3,7 +3,7 @@
#include <linux/config.h>
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
#include <asm/io.h>
#define hard_smp_processor_id() \