diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /arch/arm/nwfpe | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'arch/arm/nwfpe')
| -rw-r--r-- | arch/arm/nwfpe/fpa11_cpdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/nwfpe/fpa11_cpdt.c b/arch/arm/nwfpe/fpa11_cpdt.c index 79f8e67cc6c1..d31c49f953b1 100644 --- a/arch/arm/nwfpe/fpa11_cpdt.c +++ b/arch/arm/nwfpe/fpa11_cpdt.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include "fpmodule.h" | 26 | #include "fpmodule.h" |
| 27 | #include "fpmodule.inl" | 27 | #include "fpmodule.inl" |
| 28 | 28 | ||
| 29 | #include <asm/uaccess.h> | 29 | #include <linux/uaccess.h> |
| 30 | 30 | ||
| 31 | static inline void loadSingle(const unsigned int Fn, const unsigned int __user *pMem) | 31 | static inline void loadSingle(const unsigned int Fn, const unsigned int __user *pMem) |
| 32 | { | 32 | { |