diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/geode.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/reboot_fixups_32.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/include/asm/geode.h b/arch/x86/include/asm/geode.h index 547e9642642a..976b3f11c009 100644 --- a/arch/x86/include/asm/geode.h +++ b/arch/x86/include/asm/geode.h | |||
@@ -45,8 +45,6 @@ extern int geode_get_dev_base(unsigned int dev); | |||
45 | #define MSR_LBAR_ACPI 0x5140000E | 45 | #define MSR_LBAR_ACPI 0x5140000E |
46 | #define MSR_LBAR_PMS 0x5140000F | 46 | #define MSR_LBAR_PMS 0x5140000F |
47 | 47 | ||
48 | #define MSR_DIVIL_SOFT_RESET 0x51400017 | ||
49 | |||
50 | #define MSR_LX_SPARE_MSR 0x80000011 /* DC-specific */ | 48 | #define MSR_LX_SPARE_MSR 0x80000011 /* DC-specific */ |
51 | 49 | ||
52 | #define MSR_GX_GLD_MSR_CONFIG 0xC0002001 | 50 | #define MSR_GX_GLD_MSR_CONFIG 0xC0002001 |
diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c index 201eab63b05f..fda313ebbb03 100644 --- a/arch/x86/kernel/reboot_fixups_32.c +++ b/arch/x86/kernel/reboot_fixups_32.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
13 | #include <asm/reboot_fixups.h> | 13 | #include <asm/reboot_fixups.h> |
14 | #include <asm/msr.h> | 14 | #include <asm/msr.h> |
15 | #include <asm/geode.h> | 15 | #include <linux/cs5535.h> |
16 | 16 | ||
17 | static void cs5530a_warm_reset(struct pci_dev *dev) | 17 | static void cs5530a_warm_reset(struct pci_dev *dev) |
18 | { | 18 | { |