diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 10:43:50 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 10:43:50 -0400 |
| commit | 2d4b3f37ded8998a362c8d0b4be02f583dd9a002 (patch) | |
| tree | 5c66ddaf0a6ab6d898931a5ed58c7aa844b94740 /include/asm-m68k/setup.h | |
| parent | 7022b15e2a9f878fd5184586064c63352c3dd225 (diff) | |
| parent | 8033c6e9736c29cce5f0d0abbca9a44dffb20c39 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-m68k/setup.h')
| -rw-r--r-- | include/asm-m68k/setup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h index 2a8853cd6554..4dfb3952b375 100644 --- a/include/asm-m68k/setup.h +++ b/include/asm-m68k/setup.h | |||
| @@ -248,7 +248,7 @@ extern unsigned long m68k_machtype; | |||
| 248 | #ifndef __ASSEMBLY__ | 248 | #ifndef __ASSEMBLY__ |
| 249 | extern unsigned long m68k_cputype; | 249 | extern unsigned long m68k_cputype; |
| 250 | extern unsigned long m68k_fputype; | 250 | extern unsigned long m68k_fputype; |
| 251 | extern unsigned long m68k_mmutype; /* Not really used yet */ | 251 | extern unsigned long m68k_mmutype; |
| 252 | #ifdef CONFIG_VME | 252 | #ifdef CONFIG_VME |
| 253 | extern unsigned long vme_brdtype; | 253 | extern unsigned long vme_brdtype; |
| 254 | #endif | 254 | #endif |