summaryrefslogtreecommitdiffstats
path: root/fs/attr.c
diff options
context:
space:
mode:
authorNathan Scott <nathans@bruce>2006-01-12 13:34:47 +1100
committerNathan Scott <nathans@bruce>2006-01-12 13:34:47 +1100
commitddae9c2ea79449beb00027cf77fca6dc489f2d15 (patch)
tree047c2d7c8d6cbb0721f017514e1d83a20e278d43 /fs/attr.c
parent0d1335b3106687d87fcfa0e4d90f2a961bd7e1db (diff)
parenta4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff)
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
Diffstat (limited to 'fs/attr.c')
-rw-r--r--fs/attr.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/attr.c b/fs/attr.c
index b34732506f1..d63e5096f2f 100644
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -14,7 +14,6 @@
#include <linux/fcntl.h>
#include <linux/quotaops.h>
#include <linux/security.h>
-#include <linux/time.h>
/* Taken over from the old code... */