diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 21:39:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 21:39:35 +0200 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /arch/arm/nwfpe/fpa11_cpdt.c | |
| parent | leo: disable cursor when leaving graphics mode (diff) | |
| parent | Merge phase #4 (X2APIC, APIC unification, CPU identification unification) of ... (diff) | |
| download | linux-56c5d900dbb8e042bfad035d18433476931d8f93.tar.xz linux-56c5d900dbb8e042bfad035d18433476931d8f93.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'arch/arm/nwfpe/fpa11_cpdt.c')
| -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 @@ #include "fpmodule.h" #include "fpmodule.inl" -#include <asm/uaccess.h> +#include <linux/uaccess.h> static inline void loadSingle(const unsigned int Fn, const unsigned int __user *pMem) { |