Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 96872
b: refs/heads/master
c: 91cf248
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed May 18, 2008
1 parent 00f9e9c commit 40d9999
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3f20a4ef57f4cbe8e2bbdb12640548795b32c6f7
refs/heads/master: 91cf248396d18989f5f4090497723f4f90c8971f
3 changes: 2 additions & 1 deletion trunk/arch/m68k/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@
#endif

unsigned long m68k_machtype;
unsigned long m68k_cputype;
EXPORT_SYMBOL(m68k_machtype);
unsigned long m68k_cputype;
EXPORT_SYMBOL(m68k_cputype);
unsigned long m68k_fputype;
unsigned long m68k_mmutype;
EXPORT_SYMBOL(m68k_mmutype);
#ifdef CONFIG_VME
unsigned long vme_brdtype;
EXPORT_SYMBOL(vme_brdtype);
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-m68k/setup.h
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ extern unsigned long m68k_machtype;
#ifndef __ASSEMBLY__
extern unsigned long m68k_cputype;
extern unsigned long m68k_fputype;
extern unsigned long m68k_mmutype; /* Not really used yet */
extern unsigned long m68k_mmutype;
#ifdef CONFIG_VME
extern unsigned long vme_brdtype;
#endif
Expand Down

0 comments on commit 40d9999

Please sign in to comment.