diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-09-14 17:24:57 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-09-14 17:26:10 +0200 |
commit | d3f9990f1b48514b33342612b51fad238592d774 (patch) | |
tree | 9ad5ae81ba3e820e91a09e2675b7c98675bd809e /drivers/fpga/dfl-fme-mgr.c | |
parent | e1a00b5b253a4f97216b9a33199a863987075162 (diff) | |
parent | 7711fb7dac1ab77fd1b4d948f4647a569e4a1ae2 (diff) |
Merge branch 'for-next' into for-linus
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/fpga/dfl-fme-mgr.c')
-rw-r--r-- | drivers/fpga/dfl-fme-mgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/fpga/dfl-fme-mgr.c b/drivers/fpga/dfl-fme-mgr.c index 76f37709dd1ae..b3f7eee3c93f6 100644 --- a/drivers/fpga/dfl-fme-mgr.c +++ b/drivers/fpga/dfl-fme-mgr.c @@ -30,8 +30,8 @@ #define FME_PR_STS 0x10 #define FME_PR_DATA 0x18 #define FME_PR_ERR 0x20 -#define FME_PR_INTFC_ID_H 0xA8 -#define FME_PR_INTFC_ID_L 0xB0 +#define FME_PR_INTFC_ID_L 0xA8 +#define FME_PR_INTFC_ID_H 0xB0 /* FME PR Control Register Bitfield */ #define FME_PR_CTRL_PR_RST BIT_ULL(0) /* Reset PR engine */ |