diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-10-03 11:31:08 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-26 11:09:18 +0100 |
| commit | 7678e77d2a2fb2dd74a27b8283e030c580294a62 (patch) | |
| tree | 6c7536fcc26e85aed8a22867f9e059ed1e84abc8 /arch/m68k | |
| parent | 7bc449688bf73891625616f3f2e93e359603016b (diff) | |
m68k/UAPI: Move Apollo model definitions to <asm/bootinfo-apollo.h>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/apollohw.h | 11 | ||||
| -rw-r--r-- | arch/m68k/include/uapi/asm/bootinfo-apollo.h | 12 |
2 files changed, 14 insertions, 9 deletions
diff --git a/arch/m68k/include/asm/apollohw.h b/arch/m68k/include/asm/apollohw.h index 6c19e0c2241..87fc899d32e 100644 --- a/arch/m68k/include/asm/apollohw.h +++ b/arch/m68k/include/asm/apollohw.h @@ -5,18 +5,11 @@ #include <linux/types.h> -/* - apollo models -*/ +#include <asm/bootinfo-apollo.h> + extern u_long apollo_model; -#define APOLLO_UNKNOWN (0) -#define APOLLO_DN3000 (1) -#define APOLLO_DN3010 (2) -#define APOLLO_DN3500 (3) -#define APOLLO_DN4000 (4) -#define APOLLO_DN4500 (5) /* see scn2681 data sheet for more info. diff --git a/arch/m68k/include/uapi/asm/bootinfo-apollo.h b/arch/m68k/include/uapi/asm/bootinfo-apollo.h index 3a2051e822b..69923697e13 100644 --- a/arch/m68k/include/uapi/asm/bootinfo-apollo.h +++ b/arch/m68k/include/uapi/asm/bootinfo-apollo.h @@ -13,4 +13,16 @@ #define BI_APOLLO_MODEL 0x8000 /* model (u_long) */ + /* + * Apollo models (BI_APOLLO_MODEL) + */ + +#define APOLLO_UNKNOWN 0 +#define APOLLO_DN3000 1 +#define APOLLO_DN3010 2 +#define APOLLO_DN3500 3 +#define APOLLO_DN4000 4 +#define APOLLO_DN4500 5 + + #endif /* _UAPI_ASM_M68K_BOOTINFO_APOLLO_H */ |