diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2015-02-06 17:53:09 +0800 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-02-09 11:46:27 +1100 |
| commit | 4e60baa269007715c1ff81acf0fc1a94ee19a3f1 (patch) | |
| tree | 88fd083745bbc52b29371842b59287557afd561d /include | |
| parent | 5c70f1c764abeec7c29171285ec90af3318b113d (diff) | |
| download | skiboot-4e60baa269007715c1ff81acf0fc1a94ee19a3f1.zip skiboot-4e60baa269007715c1ff81acf0fc1a94ee19a3f1.tar.gz skiboot-4e60baa269007715c1ff81acf0fc1a94ee19a3f1.tar.bz2 | |
Fix commit 16c80346
Commit 16c80346 change included some reverts of previous commits, which
we need. This change reverts those reverts, leaving the original intent
of that change.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/opal.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/opal.h b/include/opal.h index 0cbdf4d..2da0929 100644 --- a/include/opal.h +++ b/include/opal.h @@ -51,7 +51,6 @@ #define OPAL_I2C_STOP_ERR -24 /* API Tokens (in r0) */ -#define OPAL_INVALID_CALL -1 #define OPAL_TEST 0 #define OPAL_CONSOLE_WRITE 1 #define OPAL_CONSOLE_READ 2 @@ -164,7 +163,6 @@ #ifndef __ASSEMBLY__ /* Other enums */ - enum OpalVendorApiTokens { OPAL_START_VENDOR_API_RANGE = 1000, OPAL_END_VENDOR_API_RANGE = 1999 }; @@ -256,6 +254,7 @@ enum OpalMmioWindowType { OPAL_M64_WINDOW_TYPE = 2, OPAL_IO_WINDOW_TYPE = 3 }; + enum OpalShpcSlotState { OPAL_SHPC_DEV_NOT_PRESENT = 0, OPAL_SHPC_DEV_PRESENT = 1 |