diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-06 16:12:13 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-06 16:12:26 +0000 |
| commit | 6b60805502fecc5ce05dad68fd242c4f3a1d1f1b (patch) | |
| tree | a53537e00ede0a31b8f9f91c1d79d1e1a6670797 /arch/s390/mm/fault.c | |
| parent | 4c75aab698d4b7cc08f3a5dd329fc7e9af3d0e3c (diff) | |
| parent | af829310e8a914ad17ed61a7b18b14b4f457bca1 (diff) | |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
* 'fixes' of git://github.com/hzhuang1/linux: (3 commits)
ARM: pxa: fix invalid mfp pin issue
ARM: pxa: remove duplicated registeration on pxa-gpio
ARM: pxa: add dummy clock for pxa25x and pxa27x
Includes an update to v3.3-rc6
Diffstat (limited to 'arch/s390/mm/fault.c')
| -rw-r--r-- | arch/s390/mm/fault.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 354dd39073e..e8fcd928dc7 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -36,7 +36,6 @@ #include <asm/pgtable.h> #include <asm/irq.h> #include <asm/mmu_context.h> -#include <asm/compat.h> #include "../kernel/entry.h" #ifndef CONFIG_64BIT |