git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
cpu
/
umc.c
diff --git
a/arch/i386/kernel/cpu/umc.c
b/arch/i386/kernel/cpu/umc.c
index
2cd988f
..
1bf3f87
100644
(file)
--- a/
arch/i386/kernel/cpu/umc.c
+++ b/
arch/i386/kernel/cpu/umc.c
@@
-5,12
+5,8
@@
/* UMC chips appear to be only either 386 or 486, so no special init takes place.
*/
/* UMC chips appear to be only either 386 or 486, so no special init takes place.
*/
-static void __init init_umc(struct cpuinfo_x86 * c)
-{
-
-}
-static struct cpu_dev umc_cpu_dev __initdata = {
+static struct cpu_dev umc_cpu_dev __
cpu
initdata = {
.c_vendor = "UMC",
.c_ident = { "UMC UMC UMC" },
.c_models = {
.c_vendor = "UMC",
.c_ident = { "UMC UMC UMC" },
.c_models = {
@@
-21,7
+17,6
@@
static struct cpu_dev umc_cpu_dev __initdata = {
}
},
},
}
},
},
- .c_init = init_umc,
};
int __init umc_init_cpu(void)
};
int __init umc_init_cpu(void)