diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-13 14:44:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-13 14:44:04 +0200 |
| commit | 0740ac26f4e590bf5b4e7b9a9886208dc2dacb32 (patch) | |
| tree | 5d18fcb91d491f602c17c550af70a9a092b883f8 /include/asm-m68k | |
| parent | af577da58642b81eb94067e3d9e9dc6998cd620d (diff) | |
| parent | 47bf9c71ae838305a3ea3161af8d14e6f3fc2c82 (diff) | |
| download | talos-obmc-uboot-0740ac26f4e590bf5b4e7b9a9886208dc2dacb32.tar.gz talos-obmc-uboot-0740ac26f4e590bf5b4e7b9a9886208dc2dacb32.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
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 030720c89f..1a5de05871 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 */ |
