Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[linux-2.6] / arch / x86 / 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 /*
7  * UMC chips appear to be only either 386 or 486,
8  * so no special init takes place.
9  */
10
11 static struct cpu_dev umc_cpu_dev __cpuinitdata = {
12         .c_vendor       = "UMC",
13         .c_ident        = { "UMC UMC UMC" },
14         .c_models = {
15                 { .vendor = X86_VENDOR_UMC, .family = 4, .model_names =
16                   {
17                           [1] = "U5D",
18                           [2] = "U5S",
19                   }
20                 },
21         },
22 };
23
24 cpu_vendor_dev_register(X86_VENDOR_UMC, &umc_cpu_dev);
25