git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~dwmw2/random-2.6
[pandora-kernel.git]
/
include
/
asm-cris
/
posix_types.h
diff --git
a/include/asm-cris/posix_types.h
b/include/asm-cris/posix_types.h
index
92000d0
..
ce3fb25
100644
(file)
--- a/
include/asm-cris/posix_types.h
+++ b/
include/asm-cris/posix_types.h
@@
-44,15
+44,10
@@
typedef long long __kernel_loff_t;
#endif
typedef struct {
#endif
typedef struct {
-#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2];
int val[2];
-#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
- int __val[2];
-#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t;
#ifdef __KERNEL__
} __kernel_fsid_t;
#ifdef __KERNEL__
-#include <linux/bitops.h>
#undef __FD_SET
#define __FD_SET(fd,fdsetp) set_bit(fd, (void *)(fdsetp))
#undef __FD_SET
#define __FD_SET(fd,fdsetp) set_bit(fd, (void *)(fdsetp))