The patch titled
cs5535: move the DIVIL MSR definition into linux/cs5535.h
has been removed from the -mm tree. Its filename was
cs5535-move-the-divil-msr-definition-into-linux-cs5535h.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: cs5535: move the DIVIL MSR definition into linux/cs5535.h
From: Andres Salomon <dilinger@xxxxxxxxxxxxxxx>
The only thing that uses this is the reboot_fixups code.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxxxxxxx>
Cc: Jordan Crouse <jordan@xxxxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Cc: Chris Ball <cjb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/geode.h | 2 --
arch/x86/kernel/reboot_fixups_32.c | 2 +-
include/linux/cs5535.h | 2 ++
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/x86/include/asm/geode.h~cs5535-move-the-divil-msr-definition-into-linux-cs5535h arch/x86/include/asm/geode.h
--- a/arch/x86/include/asm/geode.h~cs5535-move-the-divil-msr-definition-into-linux-cs5535h
+++ a/arch/x86/include/asm/geode.h
@@ -45,8 +45,6 @@ extern int geode_get_dev_base(unsigned i
#define MSR_LBAR_ACPI 0x5140000E
#define MSR_LBAR_PMS 0x5140000F
-#define MSR_DIVIL_SOFT_RESET 0x51400017
-
#define MSR_LX_SPARE_MSR 0x80000011 /* DC-specific */
#define MSR_GX_GLD_MSR_CONFIG 0xC0002001
diff -puN arch/x86/kernel/reboot_fixups_32.c~cs5535-move-the-divil-msr-definition-into-linux-cs5535h arch/x86/kernel/reboot_fixups_32.c
--- a/arch/x86/kernel/reboot_fixups_32.c~cs5535-move-the-divil-msr-definition-into-linux-cs5535h
+++ a/arch/x86/kernel/reboot_fixups_32.c
@@ -12,7 +12,7 @@
#include <linux/interrupt.h>
#include <asm/reboot_fixups.h>
#include <asm/msr.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
static void cs5530a_warm_reset(struct pci_dev *dev)
{
diff -puN include/linux/cs5535.h~cs5535-move-the-divil-msr-definition-into-linux-cs5535h include/linux/cs5535.h
--- a/include/linux/cs5535.h~cs5535-move-the-divil-msr-definition-into-linux-cs5535h
+++ a/include/linux/cs5535.h
@@ -18,6 +18,8 @@
#define MSR_LBAR_ACPI 0x5140000E
#define MSR_LBAR_PMS 0x5140000F
+#define MSR_DIVIL_SOFT_RESET 0x51400017
+
#define MSR_PIC_YSEL_LOW 0x51400020
#define MSR_PIC_YSEL_HIGH 0x51400021
#define MSR_PIC_ZSEL_LOW 0x51400022
_
Patches currently in -mm which might be from dilinger@xxxxxxxxxxxxxxx are
origin.patch
lxfb-add-copyright-license-info.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
