Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / fs / udf / udfend.h

diff --git a/fs/udf/udfend.h b/fs/udf/udfend.h
index c4bd1203f857a5bb72c8df677c23aaebacc5f396..489f52fb428cd309fb73002be58ce8b38bb09f0d 100644 (file)
--- a/fs/udf/udfend.h
+++ b/fs/udf/udfend.h
@@ -24,17 +24,6 @@ static inline lb_addr cpu_to_lelb(kernel_lb_addr in)
        return out;
 }
 
-static inline kernel_timestamp lets_to_cpu(timestamp in)
-{
-       kernel_timestamp out;
-
-       memcpy(&out, &in, sizeof(timestamp));
-       out.typeAndTimezone = le16_to_cpu(in.typeAndTimezone);
-       out.year = le16_to_cpu(in.year);
-
-       return out;
-}
-
 static inline short_ad lesa_to_cpu(short_ad in)
 {
        short_ad out;
@@ -85,15 +74,4 @@ static inline kernel_extent_ad leea_to_cpu(extent_ad in)
        return out;
 }
 
-static inline timestamp cpu_to_lets(kernel_timestamp in)
-{
-       timestamp out;
-
-       memcpy(&out, &in, sizeof(timestamp));
-       out.typeAndTimezone = cpu_to_le16(in.typeAndTimezone);
-       out.year = cpu_to_le16(in.year);
-
-       return out;
-}
-
 #endif /* __UDF_ENDIAN_H */