Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-generic / resource.h

diff --git a/include/asm-generic/resource.h b/include/asm-generic/resource.h
index cfe3692b23e580a01ccf0ad7a9102e854c8be792..a4a22cc358987c86999ef602301b2ca189526dfe 100644 (file)
--- a/include/asm-generic/resource.h
+++ b/include/asm-generic/resource.h
@@ -12,7 +12,7 @@
  *   then it defines them prior including asm-generic/resource.h. )
  */
 
-#define RLIMIT_CPU             0       /* CPU time in ms */
+#define RLIMIT_CPU             0       /* CPU time in sec */
 #define RLIMIT_FSIZE           1       /* Maximum filesize */
 #define RLIMIT_DATA            2       /* max data size */
 #define RLIMIT_STACK           3       /* max stack size */