diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/i386/kernel/cpuid.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/i386/kernel/cpuid.c')
| -rw-r--r-- | arch/i386/kernel/cpuid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c index 4647db4ad6de..13bae799e626 100644 --- a/arch/i386/kernel/cpuid.c +++ b/arch/i386/kernel/cpuid.c | |||
| @@ -163,7 +163,7 @@ static int cpuid_class_device_create(int i) | |||
| 163 | int err = 0; | 163 | int err = 0; |
| 164 | struct class_device *class_err; | 164 | struct class_device *class_err; |
| 165 | 165 | ||
| 166 | class_err = class_device_create(cpuid_class, MKDEV(CPUID_MAJOR, i), NULL, "cpu%d",i); | 166 | class_err = class_device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, i), NULL, "cpu%d",i); |
| 167 | if (IS_ERR(class_err)) | 167 | if (IS_ERR(class_err)) |
| 168 | err = PTR_ERR(class_err); | 168 | err = PTR_ERR(class_err); |
| 169 | return err; | 169 | return err; |