diff options
| author | Andres Salomon | 2009-12-15 03:00:40 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-12-15 17:53:28 +0100 |
| commit | f060f27007b393bac6e50ee6fc26d8505acf6fe4 (patch) | |
| tree | fd83b0c9550814dfb5fc6a726ce7b5eb1baaa6f3 /arch/x86/kernel/olpc.c | |
| parent | cs5535: move the DIVIL MSR definition into linux/cs5535.h (diff) | |
| download | kernel-qcow2-linux-f060f27007b393bac6e50ee6fc26d8505acf6fe4.tar.gz kernel-qcow2-linux-f060f27007b393bac6e50ee6fc26d8505acf6fe4.tar.xz kernel-qcow2-linux-f060f27007b393bac6e50ee6fc26d8505acf6fe4.zip | |
cs5535: move VSA2 checks into linux/cs5535.h
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/kernel/olpc.c')
| -rw-r--r-- | arch/x86/kernel/olpc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c index 4006c522adc7..9d1d263f786f 100644 --- a/arch/x86/kernel/olpc.c +++ b/arch/x86/kernel/olpc.c @@ -212,7 +212,7 @@ static int __init olpc_init(void) unsigned char *romsig; /* The ioremap check is dangerous; limit what we run it on */ - if (!is_geode() || geode_has_vsa2()) + if (!is_geode() || cs5535_has_vsa2()) return 0; spin_lock_init(&ec_lock); @@ -244,7 +244,7 @@ static int __init olpc_init(void) (unsigned char *) &olpc_platform_info.ecver, 1); /* check to see if the VSA exists */ - if (geode_has_vsa2()) + if (cs5535_has_vsa2()) olpc_platform_info.flags |= OLPC_F_VSA; printk(KERN_INFO "OLPC board revision %s%X (EC=%x)\n", |