diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 15:52:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 15:52:51 -0700 |
| commit | a45c657f28f82b056173d1afc2e7ed1f1f68829f (patch) | |
| tree | d973960f6b70a3ee60a5ee43892ecee2268e4c43 /arch | |
| parent | 489f50be56185fa3492690caedc099d507bf7c98 (diff) | |
| parent | 9117710a5997eb078035052800a31b77d47e0e5a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k changes from Geert Uytterhoeven:
"Extremely non-spectacular changes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/sun3: Remove define statement no longer needed
zorro: Use ARRAY_SIZE
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/include/asm/sun3_pgalloc.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h index f868506e3350..0931388de47f 100644 --- a/arch/m68k/include/asm/sun3_pgalloc.h +++ b/arch/m68k/include/asm/sun3_pgalloc.h @@ -12,10 +12,6 @@ #include <asm/tlb.h> -/* FIXME - when we get this compiling */ -/* erm, now that it's compiling, what do we do with it? */ -#define _KERNPG_TABLE 0 - extern const char bad_pmd_string[]; #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) |