git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.6-1.422
[linux-2.6.git]
/
include
/
asm-s390
/
types.h
diff --git
a/include/asm-s390/types.h
b/include/asm-s390/types.h
index
ca4afdd
..
dd57b3f
100644
(file)
--- a/
include/asm-s390/types.h
+++ b/
include/asm-s390/types.h
@@
-93,9
+93,10
@@
typedef u64 sector_t;
#define HAVE_SECTOR_T
#endif
+#endif /* ! __s390x__ */
+
typedef unsigned int kmem_bufctl_t;
-#endif /* ! __s390x__ */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _S390_TYPES_H */