diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/at91rm9200dk_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/at91rm9200ek_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/csb337_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/csb637_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/kafa_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/onearm_defconfig | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig index c82e4667f45e..b43041476e02 100644 --- a/arch/arm/configs/at91rm9200dk_defconfig +++ b/arch/arm/configs/at91rm9200dk_defconfig | |||
| @@ -577,7 +577,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y | |||
| 577 | # Watchdog Device Drivers | 577 | # Watchdog Device Drivers |
| 578 | # | 578 | # |
| 579 | # CONFIG_SOFT_WATCHDOG is not set | 579 | # CONFIG_SOFT_WATCHDOG is not set |
| 580 | CONFIG_AT91_WATCHDOG=y | 580 | CONFIG_AT91RM9200_WATCHDOG=y |
| 581 | 581 | ||
| 582 | # | 582 | # |
| 583 | # USB-based Watchdog Cards | 583 | # USB-based Watchdog Cards |
diff --git a/arch/arm/configs/at91rm9200ek_defconfig b/arch/arm/configs/at91rm9200ek_defconfig index b983fc59aa42..d96fc8386e2f 100644 --- a/arch/arm/configs/at91rm9200ek_defconfig +++ b/arch/arm/configs/at91rm9200ek_defconfig | |||
| @@ -558,7 +558,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y | |||
| 558 | # Watchdog Device Drivers | 558 | # Watchdog Device Drivers |
| 559 | # | 559 | # |
| 560 | # CONFIG_SOFT_WATCHDOG is not set | 560 | # CONFIG_SOFT_WATCHDOG is not set |
| 561 | CONFIG_AT91_WATCHDOG=y | 561 | CONFIG_AT91RM9200_WATCHDOG=y |
| 562 | 562 | ||
| 563 | # | 563 | # |
| 564 | # USB-based Watchdog Cards | 564 | # USB-based Watchdog Cards |
diff --git a/arch/arm/configs/csb337_defconfig b/arch/arm/configs/csb337_defconfig index a2d6fd398f16..20e68250d835 100644 --- a/arch/arm/configs/csb337_defconfig +++ b/arch/arm/configs/csb337_defconfig | |||
| @@ -615,7 +615,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y | |||
| 615 | # Watchdog Device Drivers | 615 | # Watchdog Device Drivers |
| 616 | # | 616 | # |
| 617 | # CONFIG_SOFT_WATCHDOG is not set | 617 | # CONFIG_SOFT_WATCHDOG is not set |
| 618 | CONFIG_AT91_WATCHDOG=y | 618 | CONFIG_AT91RM9200_WATCHDOG=y |
| 619 | 619 | ||
| 620 | # | 620 | # |
| 621 | # USB-based Watchdog Cards | 621 | # USB-based Watchdog Cards |
diff --git a/arch/arm/configs/csb637_defconfig b/arch/arm/configs/csb637_defconfig index 2a1ac6c60abc..df8595ac031f 100644 --- a/arch/arm/configs/csb637_defconfig +++ b/arch/arm/configs/csb637_defconfig | |||
| @@ -615,7 +615,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y | |||
| 615 | # Watchdog Device Drivers | 615 | # Watchdog Device Drivers |
| 616 | # | 616 | # |
| 617 | # CONFIG_SOFT_WATCHDOG is not set | 617 | # CONFIG_SOFT_WATCHDOG is not set |
| 618 | CONFIG_AT91_WATCHDOG=y | 618 | CONFIG_AT91RM9200_WATCHDOG=y |
| 619 | 619 | ||
| 620 | # | 620 | # |
| 621 | # USB-based Watchdog Cards | 621 | # USB-based Watchdog Cards |
diff --git a/arch/arm/configs/kafa_defconfig b/arch/arm/configs/kafa_defconfig index 54fcd75779da..a4cdafc1548a 100644 --- a/arch/arm/configs/kafa_defconfig +++ b/arch/arm/configs/kafa_defconfig | |||
| @@ -560,7 +560,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y | |||
| 560 | # Watchdog Device Drivers | 560 | # Watchdog Device Drivers |
| 561 | # | 561 | # |
| 562 | # CONFIG_SOFT_WATCHDOG is not set | 562 | # CONFIG_SOFT_WATCHDOG is not set |
| 563 | CONFIG_AT91_WATCHDOG=y | 563 | CONFIG_AT91RM9200_WATCHDOG=y |
| 564 | # CONFIG_NVRAM is not set | 564 | # CONFIG_NVRAM is not set |
| 565 | # CONFIG_DTLK is not set | 565 | # CONFIG_DTLK is not set |
| 566 | # CONFIG_R3964 is not set | 566 | # CONFIG_R3964 is not set |
diff --git a/arch/arm/configs/onearm_defconfig b/arch/arm/configs/onearm_defconfig index cb1d94f9049e..9b9f2155af35 100644 --- a/arch/arm/configs/onearm_defconfig +++ b/arch/arm/configs/onearm_defconfig | |||
| @@ -607,7 +607,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y | |||
| 607 | # Watchdog Device Drivers | 607 | # Watchdog Device Drivers |
| 608 | # | 608 | # |
| 609 | # CONFIG_SOFT_WATCHDOG is not set | 609 | # CONFIG_SOFT_WATCHDOG is not set |
| 610 | CONFIG_AT91_WATCHDOG=y | 610 | CONFIG_AT91RM9200_WATCHDOG=y |
| 611 | 611 | ||
| 612 | # | 612 | # |
| 613 | # USB-based Watchdog Cards | 613 | # USB-based Watchdog Cards |