Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[sfrench/cifs-2.6.git] / arch / i386 / kernel / cpu / umc.c
1 #include <linux/kernel.h>
2 #include <linux/init.h>
3 #include <asm/processor.h>
4 #include "cpu.h"
5
6 /* UMC chips appear to be only either 386 or 486, so no special init takes place.
7  */
8
9 static struct cpu_dev umc_cpu_dev __cpuinitdata = {
10         .c_vendor       = "UMC",
11         .c_ident        = { "UMC UMC UMC" },
12         .c_models = {
13                 { .vendor = X86_VENDOR_UMC, .family = 4, .model_names =
14                   { 
15                           [1] = "U5D", 
16                           [2] = "U5S", 
17                   }
18                 },
19         },
20 };
21
22 int __init umc_init_cpu(void)
23 {
24         cpu_devs[X86_VENDOR_UMC] = &umc_cpu_dev;
25         return 0;
26 }