Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[mv-sheeva.git] / arch / sparc / kernel / pcr.c

diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c
index 92e0dda141a4a1a68e3ceda6516a712725e2f0bb..1ae8cdd7e70324fab9ee621993f2761a502a221b 100644 (file)
--- a/arch/sparc/kernel/pcr.c
+++ b/arch/sparc/kernel/pcr.c
@@ -133,11 +133,16 @@ int __init pcr_arch_init(void)
 
        case cheetah:
        case cheetah_plus:
-       case spitfire:
                pcr_ops = &direct_pcr_ops;
                pcr_enable = PCR_SUN4U_ENABLE;
                break;
 
+       case spitfire:
+               /* UltraSPARC-I/II and derivatives lack a profile
+                * counter overflow interrupt so we can't make use of
+                * their hardware currently.
+                */
+               /* fallthrough */
        default:
                err = -ENODEV;
                goto out_unregister;