diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-23 09:24:10 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-23 09:24:10 -0400 |
| commit | d9214556b11a8d18ff588e60824c12041d30f791 (patch) | |
| tree | 04ab59d13961675811a55c96fb12b2b167b72318 /arch/avr32/Kconfig | |
| parent | 72a1419a9d4c859a3345e4b83f8ef7d599d3818c (diff) | |
| parent | e82c6106b04b85879d802bbbeaed30d9b10a92e2 (diff) | |
Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
Diffstat (limited to 'arch/avr32/Kconfig')
| -rw-r--r-- | arch/avr32/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index 5252e15445b0..26eca87f6735 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
| @@ -72,6 +72,8 @@ config GENERIC_BUG | |||
| 72 | 72 | ||
| 73 | source "init/Kconfig" | 73 | source "init/Kconfig" |
| 74 | 74 | ||
| 75 | source "kernel/Kconfig.freezer" | ||
| 76 | |||
| 75 | menu "System Type and features" | 77 | menu "System Type and features" |
| 76 | 78 | ||
| 77 | source "kernel/time/Kconfig" | 79 | source "kernel/time/Kconfig" |