diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 22:52:51 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 22:52:51 (GMT) |
| commit | a45c657f28f82b056173d1afc2e7ed1f1f68829f (patch) | |
| tree | d973960f6b70a3ee60a5ee43892ecee2268e4c43 | |
| parent | 489f50be56185fa3492690caedc099d507bf7c98 (diff) | |
| parent | 9117710a5997eb078035052800a31b77d47e0e5a (diff) | |
| download | linux-a45c657f28f82b056173d1afc2e7ed1f1f68829f.tar.xz | |
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
| -rw-r--r-- | arch/m68k/include/asm/sun3_pgalloc.h | 4 | ||||
| -rw-r--r-- | drivers/zorro/names.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h index f868506..0931388 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); }) diff --git a/drivers/zorro/names.c b/drivers/zorro/names.c index 6f3fd99..83eeddd 100644 --- a/drivers/zorro/names.c +++ b/drivers/zorro/names.c @@ -46,13 +46,13 @@ struct zorro_manuf_info { #include "devlist.h" static struct zorro_manuf_info __initdata zorro_manuf_list[] = { -#define MANUF( manuf, name ) { 0x##manuf, sizeof(__prods_##manuf) / sizeof(struct zorro_prod_info), __manufstr_##manuf, __prods_##manuf }, +#define MANUF( manuf, name ) { 0x##manuf, ARRAY_SIZE(__prods_##manuf), __manufstr_##manuf, __prods_##manuf }, #define ENDMANUF() #define PRODUCT( manuf, prod, name ) #include "devlist.h" }; -#define MANUFS (sizeof(zorro_manuf_list)/sizeof(struct zorro_manuf_info)) +#define MANUFS ARRAY_SIZE(zorro_manuf_list) void __init zorro_name_device(struct zorro_dev *dev) { |