Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next

[~andy/linux] / include / linux / res_counter.h

diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h
index 96a509b6be04eeaceecad4b6cc03d8d5ea60e451..201a6974965925bf5f9424acf0b63f671efd3c60 100644 (file)
--- a/include/linux/res_counter.h
+++ b/include/linux/res_counter.h
@@ -54,7 +54,7 @@ struct res_counter {
        struct res_counter *parent;
 };
 
-#define RESOURCE_MAX (unsigned long long)LLONG_MAX
+#define RES_COUNTER_MAX ULLONG_MAX
 
 /**
  * Helpers to interact with userspace