Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / include / linux / iso_fs.h

diff --git a/include/linux/iso_fs.h b/include/linux/iso_fs.h
index 15b07d3..dd53b6c 100644 (file)
--- a/include/linux/iso_fs.h
+++ b/include/linux/iso_fs.h
@@ -190,28 +190,28 @@ static inline int isonum_712(char *p)
 {
        return *(s8 *)p;
 }
-static inline int isonum_721(char *p)
+static inline unsigned int isonum_721(char *p)
 {
        return le16_to_cpu(get_unaligned((u16 *)p));
 }
-static inline int isonum_722(char *p)
+static inline unsigned int isonum_722(char *p)
 {
        return be16_to_cpu(get_unaligned((u16 *)p));
 }
-static inline int isonum_723(char *p)
+static inline unsigned int isonum_723(char *p)
 {
        /* Ignore bigendian datum due to broken mastering programs */
        return le16_to_cpu(get_unaligned((u16 *)p));
 }
-static inline int isonum_731(char *p)
+static inline unsigned int isonum_731(char *p)
 {
        return le32_to_cpu(get_unaligned((u32 *)p));
 }
-static inline int isonum_732(char *p)
+static inline unsigned int isonum_732(char *p)
 {
        return be32_to_cpu(get_unaligned((u32 *)p));
 }
-static inline int isonum_733(char *p)
+static inline unsigned int isonum_733(char *p)
 {
        /* Ignore bigendian datum due to broken mastering programs */
        return le32_to_cpu(get_unaligned((u32 *)p));
@@ -277,7 +277,7 @@ static inline unsigned long isofs_get_ino(unsigned long block,
  * and "offset" will hold normalized values.  Only directories are
  * affected making it safe to call even for non-directory file
  * types. */
-static void inline
+static inline void
 isofs_normalize_block_and_offset(struct iso_directory_record* de,
                                 unsigned long *block,
                                 unsigned long *offset)