Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / include / linux / units.h

diff --git a/include/linux/units.h b/include/linux/units.h
index dcc30a5..681fc65 100644 (file)
--- a/include/linux/units.h
+++ b/include/linux/units.h
@@ -4,9 +4,29 @@
 
 #include <linux/math.h>
 
-#define MILLIWATT_PER_WATT     1000L
-#define MICROWATT_PER_MILLIWATT        1000L
-#define MICROWATT_PER_WATT     1000000L
+/* Metric prefixes in accordance with Système international (d'unités) */
+#define PETA   1000000000000000ULL
+#define TERA   1000000000000ULL
+#define GIGA   1000000000UL
+#define MEGA   1000000UL
+#define KILO   1000UL
+#define HECTO  100UL
+#define DECA   10UL
+#define DECI   10UL
+#define CENTI  100UL
+#define MILLI  1000UL
+#define MICRO  1000000UL
+#define NANO   1000000000UL
+#define PICO   1000000000000ULL
+#define FEMTO  1000000000000000ULL
+
+#define HZ_PER_KHZ             1000UL
+#define KHZ_PER_MHZ            1000UL
+#define HZ_PER_MHZ             1000000UL
+
+#define MILLIWATT_PER_WATT     1000UL
+#define MICROWATT_PER_MILLIWATT        1000UL
+#define MICROWATT_PER_WATT     1000000UL
 
 #define ABSOLUTE_ZERO_MILLICELSIUS -273150