Merge branch 'master' into gfs2

[linux-2.6-omap-h63xx.git] / include / asm-alpha / fpu.h

diff --git a/include/asm-alpha/fpu.h b/include/asm-alpha/fpu.h
index c203fc2fa5cd2eeed5ed7d378d573d524fa49453..ecb17a72acc3e5e1d44f46152da1e2d443c4e8cd 100644 (file)
--- a/include/asm-alpha/fpu.h
+++ b/include/asm-alpha/fpu.h
@@ -130,7 +130,7 @@ rdfpcr(void)
 {
        unsigned long tmp, ret;
 
-#if defined(__alpha_cix__) || defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
        __asm__ __volatile__ (
                "ftoit $f0,%0\n\t"
                "mf_fpcr $f0\n\t"
@@ -154,7 +154,7 @@ wrfpcr(unsigned long val)
 {
        unsigned long tmp;
 
-#if defined(__alpha_cix__) || defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
        __asm__ __volatile__ (
                "ftoit $f0,%0\n\t"
                "itoft %1,$f0\n\t"