diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /arch/h8300/include/asm/mmu.h | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) | |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'arch/h8300/include/asm/mmu.h')
| -rw-r--r-- | arch/h8300/include/asm/mmu.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/h8300/include/asm/mmu.h b/arch/h8300/include/asm/mmu.h deleted file mode 100644 index 31309969df70..000000000000 --- a/arch/h8300/include/asm/mmu.h +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | #ifndef __MMU_H | ||
| 2 | #define __MMU_H | ||
| 3 | |||
| 4 | /* Copyright (C) 2002, David McCullough <davidm@snapgear.com> */ | ||
| 5 | |||
| 6 | typedef struct { | ||
| 7 | unsigned long end_brk; | ||
| 8 | } mm_context_t; | ||
| 9 | |||
| 10 | #endif | ||