Merge branch 'linux-2.6' into for-2.6.25

[mv-sheeva.git] / drivers / edac / edac_core.h

diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index e80af67664cc72829fbd0caad82a7ba50c60c5c2..2d23e304f5ec1083b9850e46fe817c74b4e78d00 100644 (file)
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -94,8 +94,6 @@ extern int edac_debug_level;
 
 #endif                         /* !CONFIG_EDAC_DEBUG */
 
-#define BIT(x) (1 << (x))
-
 #define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \
        PCI_DEVICE_ID_ ## vend ## _ ## dev