The patch titled
geode-basic-infrastructure-support-for-amd-geode-class update
has been added to the -mm tree. Its filename is
geode-basic-infrastructure-support-for-amd-geode-class-update.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: geode-basic-infrastructure-support-for-amd-geode-class update
From: Andres Salomon <dilinger@xxxxxxxxxx>
Here's an updated version of this patch that scripts/checkpatch.pl is happy
with.
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/kernel/geode.c | 7 +++----
include/asm-i386/geode.h | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff -puN arch/i386/kernel/geode.c~geode-basic-infrastructure-support-for-amd-geode-class-update arch/i386/kernel/geode.c
--- a/arch/i386/kernel/geode.c~geode-basic-infrastructure-support-for-amd-geode-class-update
+++ a/arch/i386/kernel/geode.c
@@ -10,7 +10,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/ioport.h>
-#include <asm/io.h>
+#include <linux/io.h>
#include <asm/msr.h>
#include <asm/geode.h>
@@ -37,7 +37,8 @@ static void __init init_lbars(void)
lbars[i].base = lo & 0x0000ffff;
if (lbars[i].base == 0)
- printk(KERN_ERR "geode: Couldn't initialize '%s'\n", lbars[i].name);
+ printk(KERN_ERR "geode: Couldn't initialize '%s'\n",
+ lbars[i].name);
}
}
@@ -106,7 +107,6 @@ void geode_gpio_set_irq(unsigned int gro
wrmsr(MSR_PIC_ZSEL_HIGH, lo, hi);
}
-
EXPORT_SYMBOL_GPL(geode_gpio_set_irq);
void geode_gpio_setup_event(unsigned int gpio, int pair, int pme)
@@ -141,7 +141,6 @@ void geode_gpio_setup_event(unsigned int
outl(val, base + offset);
}
-
EXPORT_SYMBOL_GPL(geode_gpio_setup_event);
static int __init geode_southbridge_init(void)
diff -puN include/asm-i386/geode.h~geode-basic-infrastructure-support-for-amd-geode-class-update include/asm-i386/geode.h
--- a/include/asm-i386/geode.h~geode-basic-infrastructure-support-for-amd-geode-class-update
+++ a/include/asm-i386/geode.h
@@ -11,7 +11,7 @@
#define _ASM_GEODE_H_
#include <asm/processor.h>
-#include <asm/io.h>
+#include <linux/io.h>
/* Generic southbridge functions */
_
Patches currently in -mm which might be from dilinger@xxxxxxxxxx are
geode-basic-infrastructure-support-for-amd-geode-class.patch
geode-basic-infrastructure-support-for-amd-geode-class-update.patch
geode-mfgpt-support-for-geode-class-machines.patch
geode-mfgpt-clock-event-device-support.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
