diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 20:36:14 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 20:36:14 -0400 |
| commit | 5b146f7e016a8727a98b3d48e4f4e128d3624cd5 (patch) | |
| tree | 308acba9e7fdb00ab1458ebacd25dd049e310996 /arch/parisc/kernel/sys_parisc32.c | |
| parent | 626f090c5cbbe557379978c7a9525011ad7fbbf6 (diff) | |
| parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) | |
Merge 3.11-rc4 into usb-next
We want those fixes in here also.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc/kernel/sys_parisc32.c')
| -rw-r--r-- | arch/parisc/kernel/sys_parisc32.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c index a134ff4da12e..bb9f3b64de55 100644 --- a/arch/parisc/kernel/sys_parisc32.c +++ b/arch/parisc/kernel/sys_parisc32.c | |||
| @@ -42,8 +42,6 @@ | |||
| 42 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
| 43 | #include <asm/mmu_context.h> | 43 | #include <asm/mmu_context.h> |
| 44 | 44 | ||
| 45 | #include "sys32.h" | ||
| 46 | |||
| 47 | #undef DEBUG | 45 | #undef DEBUG |
| 48 | 46 | ||
| 49 | #ifdef DEBUG | 47 | #ifdef DEBUG |