aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/geode.h2
-rw-r--r--arch/x86/kernel/reboot_fixups_32.c2
-rw-r--r--include/linux/cs5535.h2
3 files changed, 3 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
17static void cs5530a_warm_reset(struct pci_dev *dev) 17static void cs5530a_warm_reset(struct pci_dev *dev)
18{ 18{
diff --git a/include/linux/cs5535.h b/include/linux/cs5535.h
index 30ecb04fa570..39e93e8ed95d 100644
--- a/include/linux/cs5535.h
+++ b/include/linux/cs5535.h
@@ -18,6 +18,8 @@
18#define MSR_LBAR_ACPI 0x5140000E 18#define MSR_LBAR_ACPI 0x5140000E
19#define MSR_LBAR_PMS 0x5140000F 19#define MSR_LBAR_PMS 0x5140000F
20 20
21#define MSR_DIVIL_SOFT_RESET 0x51400017
22
21#define MSR_PIC_YSEL_LOW 0x51400020 23#define MSR_PIC_YSEL_LOW 0x51400020
22#define MSR_PIC_YSEL_HIGH 0x51400021 24#define MSR_PIC_YSEL_HIGH 0x51400021
23#define MSR_PIC_ZSEL_LOW 0x51400022 25#define MSR_PIC_ZSEL_LOW 0x51400022