diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
| commit | 33edcf133ba93ecba2e4b6472e97b689895d805c (patch) | |
| tree | 327d7a20acef64005e7c5ccbfa1265be28aeb6ac /include/linux/atm.h | |
| parent | be4d638c1597580ed2294d899d9f1a2cd10e462c (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/atm.h')
| -rw-r--r-- | include/linux/atm.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/linux/atm.h b/include/linux/atm.h index c791ddd96939..d3b292174aeb 100644 --- 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) | |||
| 231 | */ | 231 | */ |
| 232 | 232 | ||
| 233 | struct atmif_sioc { | 233 | struct atmif_sioc { |
| 234 | int number; | 234 | int number; |
| 235 | int length; | 235 | int length; |
| 236 | void __user *arg; | 236 | void __user *arg; |
| 237 | }; | 237 | }; |
| 238 | 238 | ||
| 239 | #ifdef __KERNEL__ | ||
| 240 | #ifdef CONFIG_COMPAT | ||
| 241 | #include <linux/compat.h> | ||
| 242 | struct compat_atmif_sioc { | ||
| 243 | int number; | ||
| 244 | int length; | ||
| 245 | compat_uptr_t arg; | ||
| 246 | }; | ||
| 247 | #endif | ||
| 248 | #endif | ||
| 249 | |||
| 239 | typedef unsigned short atm_backend_t; | 250 | typedef unsigned short atm_backend_t; |
| 240 | #endif | 251 | #endif |