diff options
author | Andres Salomon <dilinger@collabora.co.uk> | 2009-12-14 21:00:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:53:28 -0500 |
commit | 2e8c12436f540d3c40137ebf10268803dc972f6a (patch) | |
tree | 136bc34d4c88336f2dc09784406fea40ac6dfb0e /arch/x86 | |
parent | c30d7d2b9987e189bc6d5ec6635785b91a6ee81e (diff) |
cs5535: move the DIVIL MSR definition into linux/cs5535.h
The only thing that uses this is the reboot_fixups code.
Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
Cc: Jordan Crouse <jordan@cosmicpenguin.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Chris Ball <cjb@laptop.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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 | { |