Due to the '#ifdef __KERNEL__' being located in the wrong place, some definitions from the kernel API were placed in the UAPI header during the scripted header split. Fix this. Also, remove the duplicate comment which is only relevant to the UAPI header.
Showing the changes to include/uapi/linux (1 of 2 files). Show all
Unified · Split
| @@ -221,27 +221,4 @@ enum nubus_display_res_id { · 220 unmodified lines | |||
| 221 | NUBUS_RESID_SIXTHMODE = 0x0085 | 221 | NUBUS_RESID_SIXTHMODE = 0x0085 |
| 222 | }; | 222 | }; |
| 223 | 223 | ||
| 224 | struct nubus_dir | ||
| 225 | { | ||
| 226 | unsigned char *base; | ||
| 227 | unsigned char *ptr; | ||
| 228 | int done; | ||
| 229 | int mask; | ||
| 230 | }; | ||
| 231 | |||
| 232 | struct nubus_dirent | ||
| 233 | { | ||
| 234 | unsigned char *base; | ||
| 235 | unsigned char type; | ||
| 236 | __u32 data; /* Actually 24bits used */ | ||
| 237 | int mask; | ||
| 238 | }; | ||
| 239 | |||
| 240 | |||
| 241 | /* We'd like to get rid of this eventually. Only daynaport.c uses it now. */ | ||
| 242 | static inline void *nubus_slot_addr(int slot) | ||
| 243 | { | ||
| 244 | return (void *)(0xF0000000|(slot<<24)); | ||
| 245 | } | ||
| 246 | |||
| 247 | #endif /* _UAPILINUX_NUBUS_H */ | 224 | #endif /* _UAPILINUX_NUBUS_H */ |