git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
mfp-pxa2xx.h
diff --git
a/arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h
b/arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h
index
3e92115
..
658b28e
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h
+++ b/
arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h
@@
-1,7
+1,7
@@
#ifndef __ASM_ARCH_MFP_PXA2XX_H
#define __ASM_ARCH_MFP_PXA2XX_H
-#include <
mach
/mfp.h>
+#include <
plat
/mfp.h>
/*
* the following MFP_xxx bit definitions in mfp.h are re-used for pxa2xx: