aboutsummaryrefslogtreecommitdiff
path: root/drivers/edac
diff options
context:
space:
mode:
authorIngo Molnar2012-05-30 14:12:06 +0200
committerIngo Molnar2012-05-30 14:12:06 +0200
commit403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (patch)
treec1f762dda525faf24aa10d6f81cf043da202c54f /drivers/edac
parentfa83523f45fbb403eba4ebc5704bf98aa4da0163 (diff)
parent80f033610fb968e75f5d470233d8d0260d7a72ed (diff)
Merge branch 'x86/mce' into x86/urgent
Merge in these fixlets. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/mce_amd.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
index c6074c5cd1ef..8c87a5e87057 100644
--- a/drivers/edac/mce_amd.h
+++ b/drivers/edac/mce_amd.h
@@ -5,8 +5,6 @@
#include <asm/mce.h>
-#define BIT_64(n) (U64_C(1) << (n))
-
#define EC(x) ((x) & 0xffff)
#define XEC(x, mask) (((x) >> 16) & mask)