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 4a25e0c..681fc65 100644 (file)
--- a/include/linux/units.h
+++ b/include/linux/units.h
@@ -20,9 +20,13 @@
 #define PICO   1000000000000ULL
 #define FEMTO  1000000000000000ULL
 
-#define MILLIWATT_PER_WATT     1000L
-#define MICROWATT_PER_MILLIWATT        1000L
-#define MICROWATT_PER_WATT     1000000L
+#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