diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-05-27 17:38:08 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-05-27 17:38:08 +0200 |
commit | a58bdba749b36069ec372da9c9fd16017b6c0b47 (patch) | |
tree | 95c79448427425d1c05712a7c7fb98ed42e41539 /arch/arm/mach-orion5x/common.h | |
parent | ALSA: sound/aoa/codecs/onyx.c: use static const for texts (diff) | |
parent | ALSA: bebob: Improve comments about stream format (diff) | |
download | linux-a58bdba749b36069ec372da9c9fd16017b6c0b47.tar.gz linux-a58bdba749b36069ec372da9c9fd16017b6c0b47.tar.bz2 linux-a58bdba749b36069ec372da9c9fd16017b6c0b47.zip |
Merge branch 'topic/firewire' into for-next
This is a merge of big firewire audio stack updates by Takashi Sakamoto.
Diffstat (limited to 'arch/arm/mach-orion5x/common.h')
-rw-r--r-- | arch/arm/mach-orion5x/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h index f565f9944af2..7548db2bfb8a 100644 --- a/arch/arm/mach-orion5x/common.h +++ b/arch/arm/mach-orion5x/common.h @@ -21,7 +21,7 @@ struct mv_sata_platform_data; #define ORION_MBUS_DEVBUS_BOOT_ATTR 0x0f #define ORION_MBUS_DEVBUS_TARGET(cs) 0x01 #define ORION_MBUS_DEVBUS_ATTR(cs) (~(1 << cs)) -#define ORION_MBUS_SRAM_TARGET 0x00 +#define ORION_MBUS_SRAM_TARGET 0x09 #define ORION_MBUS_SRAM_ATTR 0x00 /* |