diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-11 01:20:30 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-11 01:20:30 +0200 |
| commit | 790af815436bc6a93e4c581840be2419897f23b1 (patch) | |
| tree | 1ba0aaacad86092aea67d3612ae066b33b117619 /arch/powerpc/include/asm/ppc4xx-uic.h | |
| parent | d0b3723034aa865b8618428739efe1d98b1a2e2b (diff) | |
| parent | db67801bf92f7fae6131dbc0d387131698fb9490 (diff) | |
| download | u-boot-imx-790af815436bc6a93e4c581840be2419897f23b1.zip u-boot-imx-790af815436bc6a93e4c581840be2419897f23b1.tar.gz u-boot-imx-790af815436bc6a93e4c581840be2419897f23b1.tar.bz2 | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/powerpc/include/asm/ppc4xx-uic.h')
| -rw-r--r-- | arch/powerpc/include/asm/ppc4xx-uic.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/ppc4xx-uic.h b/arch/powerpc/include/asm/ppc4xx-uic.h index 05b4690..58e65c1 100644 --- a/arch/powerpc/include/asm/ppc4xx-uic.h +++ b/arch/powerpc/include/asm/ppc4xx-uic.h @@ -15,7 +15,7 @@ */ #if defined(CONFIG_440GX) || defined(CONFIG_440SPE) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ - defined(CONFIG_460SX) || defined(CONFIG_APM821XX) + defined(CONFIG_460SX) #define UIC_MAX 4 #elif defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ defined(CONFIG_405EX) @@ -236,8 +236,7 @@ #define VECNUM_ETH0 (32 + 28) #endif /* CONFIG_440SPE */ -#if defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ - defined(CONFIG_APM821XX) +#if defined(CONFIG_460EX) || defined(CONFIG_460GT) /* UIC 0 */ #define VECNUM_UIC2NCI 10 #define VECNUM_UIC2CI 11 |