Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 1 insertions, 5 deletions

diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c
index 3d48f4db246..4952872d6f0 100644
--- a/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@ -517,12 +517,8 @@ stop_exit:
 
 static int check_hardware_prerequisites(void)
 {
-        unsigned long long facility_bits[2];
-
-        memcpy(facility_bits, S390_lowcore.stfle_fac_list, 32);
-        if (!(facility_bits[1] & (1ULL << 59)))
+        if (!test_facility(68))
                 return -EOPNOTSUPP;
-
         return 0;
 }
 /*