diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-06 07:16:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-06 07:16:39 -0400 |
| commit | 1cb9cb3ec0f19b8c54bb01670a530f5bc210d5f3 (patch) | |
| tree | a90a7d9f4d5d8ba6fbafcd1052df0623846d22cf /arch/microblaze/include/asm/asm.h | |
| parent | 756e76f0753fdb6b6ea10482db5ebbaf72c9df66 (diff) | |
| parent | 59e880560f49827458b82345bb5ccfb7cb93af8c (diff) | |
| download | talos-obmc-uboot-1cb9cb3ec0f19b8c54bb01670a530f5bc210d5f3.tar.gz talos-obmc-uboot-1cb9cb3ec0f19b8c54bb01670a530f5bc210d5f3.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/microblaze/include/asm/asm.h')
| -rw-r--r-- | arch/microblaze/include/asm/asm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/asm.h b/arch/microblaze/include/asm/asm.h index 11f3dd0f0e..94f0562759 100644 --- a/arch/microblaze/include/asm/asm.h +++ b/arch/microblaze/include/asm/asm.h @@ -50,7 +50,7 @@ #define NOP __asm__ __volatile__ ("nop"); /* use machine status registe USE_MSR_REG */ -#if XILINX_USE_MSR_INSTR == 1 +#if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR == 1 #define MSRSET(val) \ __asm__ __volatile__ ("msrset r0," #val ); |
