diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-i386/module.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-i386/module.h')
| -rw-r--r-- | include/asm-i386/module.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/module.h b/include/asm-i386/module.h index 508865e26308..eb7f2b4234aa 100644 --- a/include/asm-i386/module.h +++ b/include/asm-i386/module.h | |||
| @@ -52,8 +52,8 @@ struct mod_arch_specific | |||
| 52 | #define MODULE_PROC_FAMILY "CYRIXIII " | 52 | #define MODULE_PROC_FAMILY "CYRIXIII " |
| 53 | #elif defined CONFIG_MVIAC3_2 | 53 | #elif defined CONFIG_MVIAC3_2 |
| 54 | #define MODULE_PROC_FAMILY "VIAC3-2 " | 54 | #define MODULE_PROC_FAMILY "VIAC3-2 " |
| 55 | #elif CONFIG_MGEODE | 55 | #elif CONFIG_MGEODEGX1 |
| 56 | #define MODULE_PROC_FAMILY "GEODE " | 56 | #define MODULE_PROC_FAMILY "GEODEGX1 " |
| 57 | #else | 57 | #else |
| 58 | #error unknown processor family | 58 | #error unknown processor family |
| 59 | #endif | 59 | #endif |