diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-05-28 20:34:39 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-05-28 20:34:39 +0200 |
| commit | bd7bb6f8a3278caff0ac6eeaf08b188b9bb05dfc (patch) | |
| tree | 8c0d3886a19dfd82551588928b448198ac5274ce /include/watchdog.h | |
| parent | 35269d3fca60b5f73113b0443c8e40070749c1d9 (diff) | |
| parent | 1117cbf2adac59050af1751af6c6a524afa5c3ef (diff) | |
| download | olio-uboot-2014.01-bd7bb6f8a3278caff0ac6eeaf08b188b9bb05dfc.tar.xz olio-uboot-2014.01-bd7bb6f8a3278caff0ac6eeaf08b188b9bb05dfc.zip | |
Merge branch 'next' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'include/watchdog.h')
| -rw-r--r-- | include/watchdog.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/watchdog.h b/include/watchdog.h index ef2f5aac9..b9599143a 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -31,10 +31,6 @@ # error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together." #endif -#if defined(__ASSEMBLY__) && defined(__NIOS__) -# error "Configuration error: WATCHDOG_RESET inside assembler not supported for Nios platforms." -#endif - /* * Hardware watchdog */ |