Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a45c657f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 489f50be 9117710a

arch/m68k/include/asm/sun3_pgalloc.h

+0 −4
Original line number Diff line number Diff line
@@ -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); })

drivers/zorro/names.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

{