diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:35:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:35:57 +0100 |
| commit | 64b36ca7f408e0bd45487c8c28f168f11f3b6dcd (patch) | |
| tree | 0b8ed22d46d775f04d441e8c480c12ec297a005b /arch/arm/configs/qil-a9260_defconfig | |
| parent | 00a8bf859331e349713274825e6fbf20bf2ac15a (diff) | |
| parent | 402a917aca5daca69fcc91f43e6f1e6939cf393b (diff) | |
| download | kernel_samsung_smdk4412-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.zip kernel_samsung_smdk4412-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.gz kernel_samsung_smdk4412-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.bz2 | |
Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/core
Diffstat (limited to 'arch/arm/configs/qil-a9260_defconfig')
| -rw-r--r-- | arch/arm/configs/qil-a9260_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/qil-a9260_defconfig b/arch/arm/configs/qil-a9260_defconfig index cd1d717..9b32d0e 100644 --- a/arch/arm/configs/qil-a9260_defconfig +++ b/arch/arm/configs/qil-a9260_defconfig @@ -727,7 +727,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y # Watchdog Device Drivers # # CONFIG_SOFT_WATCHDOG is not set -# CONFIG_AT91SAM9_WATCHDOG is not set +# CONFIG_AT91SAM9X_WATCHDOG is not set # # USB-based Watchdog Cards |