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
[XFS] Fix merge failures
[pandora-kernel.git]
/
include
/
linux
/
atm.h
diff --git
a/include/linux/atm.h
b/include/linux/atm.h
index
c791ddd
..
d3b2921
100644
(file)
--- a/
include/linux/atm.h
+++ b/
include/linux/atm.h
@@
-231,10
+231,21
@@
static __inline__ int atmpvc_addr_in_use(struct sockaddr_atmpvc addr)
*/
struct atmif_sioc {
*/
struct atmif_sioc {
- int number;
- int length;
- void __user *arg;
+
int number;
+
int length;
+
void __user *arg;
};
};
+#ifdef __KERNEL__
+#ifdef CONFIG_COMPAT
+#include <linux/compat.h>
+struct compat_atmif_sioc {
+ int number;
+ int length;
+ compat_uptr_t arg;
+};
+#endif
+#endif
+
typedef unsigned short atm_backend_t;
#endif
typedef unsigned short atm_backend_t;
#endif