diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-12 20:37:47 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-02-12 20:37:47 +0100 |
| commit | c65715de780945950d570e2b69f94e0b186f04b4 (patch) | |
| tree | 7b0e2e835d581849ce3c71e73223b0e44c254f8b /common | |
| parent | 8b1a714013eb120674f1cfed82a838ac9cf6658f (diff) | |
| parent | 9d3f9118a9b4b54bbea48bac51c0dec7180edec0 (diff) | |
| download | blackbird-obmc-uboot-c65715de780945950d570e2b69f94e0b186f04b4.tar.gz blackbird-obmc-uboot-c65715de780945950d570e2b69f94e0b186f04b4.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_ide.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index df7bdf56ec..a1f7e57155 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -811,7 +811,8 @@ set_pcmcia_timing (int pmode) /* We only need to swap data if we are running on a big endian cpu. */ /* But Au1x00 cpu:s already swaps data in big endian mode! */ -#if defined(__LITTLE_ENDIAN) || ( defined(CONFIG_AU1X00) && !defined(CONFIG_GTH2) ) +#if defined(__LITTLE_ENDIAN) || \ + (defined(CONFIG_SOC_AU1X00) && !defined(CONFIG_GTH2)) #define input_swap_data(x,y,z) input_data(x,y,z) #else static void |
