diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2018-01-13 17:37:13 -0500 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2018-01-16 16:47:29 +0100 |
| commit | 1ff2775a32ef105d9bdbb5f00f20293244a2accc (patch) | |
| tree | d67e5a3ad48f033e7237f4e881d309d383146ed8 /include/uapi | |
| parent | 2f828fb21df42058084b16d5e07cecdc30dbc3a5 (diff) | |
| download | talos-op-linux-1ff2775a32ef105d9bdbb5f00f20293244a2accc.tar.gz talos-op-linux-1ff2775a32ef105d9bdbb5f00f20293244a2accc.zip | |
nubus: Fix up header split
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.
Fixes: 607ca46e97a1 ("UAPI: (Scripted) Disintegrate include/linux")
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/nubus.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/uapi/linux/nubus.h b/include/uapi/linux/nubus.h index f3776cc80f4d..48031e7858f1 100644 --- a/include/uapi/linux/nubus.h +++ b/include/uapi/linux/nubus.h @@ -221,27 +221,4 @@ enum nubus_display_res_id { NUBUS_RESID_SIXTHMODE = 0x0085 }; -struct nubus_dir -{ - unsigned char *base; - unsigned char *ptr; - int done; - int mask; -}; - -struct nubus_dirent -{ - unsigned char *base; - unsigned char type; - __u32 data; /* Actually 24bits used */ - int mask; -}; - - -/* We'd like to get rid of this eventually. Only daynaport.c uses it now. */ -static inline void *nubus_slot_addr(int slot) -{ - return (void *)(0xF0000000|(slot<<24)); -} - #endif /* _UAPILINUX_NUBUS_H */ |
