diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/mpc8xx_irq.h | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/mpc8xx_irq.h')
| -rw-r--r-- | include/mpc8xx_irq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mpc8xx_irq.h b/include/mpc8xx_irq.h index d2a81c0..15cf693 100644 --- a/include/mpc8xx_irq.h +++ b/include/mpc8xx_irq.h @@ -45,8 +45,8 @@ * MBX PCI/ISA/IDE interrupts. */ -#ifdef CFG_CPM_INTERRUPT -# define CPM_INTERRUPT CFG_CPM_INTERRUPT +#ifdef CONFIG_SYS_CPM_INTERRUPT +# define CPM_INTERRUPT CONFIG_SYS_CPM_INTERRUPT #else # define CPM_INTERRUPT SIU_LEVEL2 #endif |