diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 15:06:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 15:06:58 -0500 |
| commit | 2a86cb7c2b1e9eb98b36d0a3cf4444d8851968b1 (patch) | |
| tree | 9555558356509c8b938a768457f70dafe3bfa3b7 /arch/avr32/configs/favr-32_defconfig | |
| parent | 8a0eebf66e3b1deae036553ba641a9c2bdbae678 (diff) | |
| parent | c975ffadd144e8e99e83e8f80ee94efce4f170b5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
avr32: update default configuration files for Atmel boards
avr32: Convert to clocksource_register_hz
avr32: make architecture sys_clone prototype match asm-generic prototype
avr32: use syscall prototypes from asm-generic instead of arch
avr32: disable kprobes for all default configurations
avr32: boards: setup: use IS_ERR() instead of NULL check
Diffstat (limited to 'arch/avr32/configs/favr-32_defconfig')
| -rw-r--r-- | arch/avr32/configs/favr-32_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig index 0c813b661a0a..aeadc955db32 100644 --- a/arch/avr32/configs/favr-32_defconfig +++ b/arch/avr32/configs/favr-32_defconfig | |||
| @@ -11,7 +11,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 11 | # CONFIG_COMPAT_BRK is not set | 11 | # CONFIG_COMPAT_BRK is not set |
| 12 | CONFIG_PROFILING=y | 12 | CONFIG_PROFILING=y |
| 13 | CONFIG_OPROFILE=m | 13 | CONFIG_OPROFILE=m |
| 14 | CONFIG_KPROBES=y | 14 | # CONFIG_KPROBES is not set |
| 15 | CONFIG_MODULES=y | 15 | CONFIG_MODULES=y |
| 16 | CONFIG_MODULE_UNLOAD=y | 16 | CONFIG_MODULE_UNLOAD=y |
| 17 | # CONFIG_BLK_DEV_BSG is not set | 17 | # CONFIG_BLK_DEV_BSG is not set |