summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-pxa/system.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-22 22:11:56 -0400
committerJeff Garzik <jeff@garzik.org>2006-06-22 22:11:56 -0400
commit71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch)
treee786da7145d83c19a594adf76ed90d52c51058b1 /include/asm-arm/arch-pxa/system.h
parentd7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff)
parentd588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff)
downloadop-kernel-dev-71d530cd1b6d97094481002a04c77fea1c8e1c22.zip
op-kernel-dev-71d530cd1b6d97094481002a04c77fea1c8e1c22.tar.gz
Merge branch 'master' into upstream
Conflicts: drivers/scsi/libata-core.c drivers/scsi/libata-scsi.c include/linux/pci_ids.h
Diffstat (limited to 'include/asm-arm/arch-pxa/system.h')
-rw-r--r--include/asm-arm/arch-pxa/system.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/system.h b/include/asm-arm/arch-pxa/system.h
index 840a46b..1d56a3e 100644
--- a/include/asm-arm/arch-pxa/system.h
+++ b/include/asm-arm/arch-pxa/system.h
@@ -10,6 +10,7 @@
* published by the Free Software Foundation.
*/
+#include <asm/proc-fns.h>
#include "hardware.h"
#include "pxa-regs.h"
OpenPOWER on IntegriCloud