]> err.no Git - linux-2.6/commitdiff
[PATCH] udf: remove duplicate definitions
authorPekka Enberg <penberg@cs.helsinki.fi>
Sat, 25 Mar 2006 11:08:21 +0000 (03:08 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 25 Mar 2006 16:23:01 +0000 (08:23 -0800)
This patch removes duplicate definitions from include/linux/udf_fs_i.h
which are already defined in fs/udf/ecma_167.h.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/linux/udf_fs_i.h

index 1e7508420fcfb6fab284ab15203d1cb1670f4ac2..ffaf05679ffb2dad2e5d4ee58fc899bf35612e3d 100644 (file)
 
 #ifdef __KERNEL__
 
-#ifndef _ECMA_167_H
-typedef struct
-{
-       __u32                   logicalBlockNum;
-       __u16                   partitionReferenceNum;
-} __attribute__ ((packed)) lb_addr;
-
-typedef struct
-{
-       __u32                   extLength;
-       __u32                   extPosition;
-} __attribute__ ((packed)) short_ad;
-
-typedef struct
-{
-       __u32                   extLength;
-       lb_addr                 extLocation;
-       __u8                    impUse[6];
-} __attribute__ ((packed)) long_ad;
-#endif
-
 struct udf_inode_info
 {
        struct timespec         i_crtime;