diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-18 17:27:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-18 17:27:41 -0800 |
| commit | 6f2a9d7b968b6f06031a8ac7efaf073fd1975b9a (patch) | |
| tree | 6e689605d73b60091fe346da88fe4c60b3451242 /include/linux | |
| parent | 44ef2d6a89293b12a278c5bf4e4777432c7523b6 (diff) | |
| parent | 274c7da79ca2c92a790622b679622c984b75998b (diff) | |
Merge master.kernel.org:/home/dwmw2/BK/jffs2-forlinus-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 4 | ||||
| -rw-r--r-- | include/linux/udf_fs_i.h | 5 | ||||
| -rw-r--r-- | include/linux/udf_fs_sb.h | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 6ce7d11cc8f9..b434f2725c23 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -438,9 +438,9 @@ extern void device_resume(u32 level); extern void device_shutdown(void); -/* drivrs/base/firmware.c */ +/* drivers/base/firmware.c */ extern int firmware_register(struct subsystem *); -extern void firmware_uregister(struct subsystem *); +extern void firmware_unregister(struct subsystem *); /* debugging and troubleshooting/diagnostic helpers. */ #ifdef DEBUG diff --git a/include/linux/udf_fs_i.h b/include/linux/udf_fs_i.h index f297d528aded..186a5a47b50b 100644 --- a/include/linux/udf_fs_i.h +++ b/include/linux/udf_fs_i.h @@ -43,10 +43,7 @@ typedef struct struct udf_inode_info { - long i_umtime; - long i_uctime; - long i_crtime; - long i_ucrtime; + struct timespec i_crtime; /* Physical address of inode */ lb_addr i_location; __u64 i_unique; diff --git a/include/linux/udf_fs_sb.h b/include/linux/udf_fs_sb.h index e898136bf947..b73cebba5551 100644 --- a/include/linux/udf_fs_sb.h +++ b/include/linux/udf_fs_sb.h @@ -97,7 +97,7 @@ struct udf_sb_info uid_t s_uid; /* Root Info */ - time_t s_recordtime; + struct timespec s_recordtime; /* Fileset Info */ __u16 s_serialnum; |