diff options
author | Wolfgang Denk <wd@denx.de> | 2008-07-13 14:44:12 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-07-13 14:44:12 +0200 |
commit | c90d115913a921c7548ad6eaaa0e13d4f484334c (patch) | |
tree | 324cbb51ec8d0e8047bbce13d5f9900da2db1cbe /include/asm-m68k | |
parent | dc42c7c08000f97651b763ab5b614e5f74c443ee (diff) | |
parent | 0740ac26f4e590bf5b4e7b9a9886208dc2dacb32 (diff) | |
download | u-boot-imx-c90d115913a921c7548ad6eaaa0e13d4f484334c.zip u-boot-imx-c90d115913a921c7548ad6eaaa0e13d4f484334c.tar.gz u-boot-imx-c90d115913a921c7548ad6eaaa0e13d4f484334c.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/asm-m68k')
-rw-r--r-- | include/asm-m68k/timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/timer.h b/include/asm-m68k/timer.h index 030720c..1a5de05 100644 --- a/include/asm-m68k/timer.h +++ b/include/asm-m68k/timer.h @@ -33,7 +33,7 @@ /****************************************************************************/ /* DMA Timer module registers */ typedef struct dtimer_ctrl { -#if defined(CONFIG_M5249) || defined(CONFIG_M5253) +#if defined(CONFIG_M5249) || defined(CONFIG_M5253) || defined(CONFIG_M5272) u16 tmr; /* 0x00 Mode register */ u16 res1; /* 0x02 */ u16 trr; /* 0x04 Reference register */ |