Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[linux-2.6-omap-h63xx.git] / include / linux / stat.h

diff --git a/include/linux/stat.h b/include/linux/stat.h
index 8669291352dba326e952d0f2a02e5e2a552101b8..611c398dab72bd52e47c3945e81935b25956d818 100644 (file)
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
@@ -53,11 +53,14 @@
 #define S_IWUGO                (S_IWUSR|S_IWGRP|S_IWOTH)
 #define S_IXUGO                (S_IXUSR|S_IXGRP|S_IXOTH)
 
+#define UTIME_NOW      ((1l << 30) - 1l)
+#define UTIME_OMIT     ((1l << 30) - 2l)
+
 #include <linux/types.h>
 #include <linux/time.h>
 
 struct kstat {
-       unsigned long   ino;
+       u64             ino;
        dev_t           dev;
        umode_t         mode;
        unsigned int    nlink;