diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/avr32 | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/boards/hammerhead/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/boards/hammerhead/Kconfig b/arch/avr32/boards/hammerhead/Kconfig index fda2331f9789..5c13d785cc70 100644 --- a/arch/avr32/boards/hammerhead/Kconfig +++ b/arch/avr32/boards/hammerhead/Kconfig | |||
| @@ -24,7 +24,7 @@ config BOARD_HAMMERHEAD_SND | |||
| 24 | bool "Atmel AC97 Sound support" | 24 | bool "Atmel AC97 Sound support" |
| 25 | help | 25 | help |
| 26 | This enables Sound support for the Hammerhead board. You may | 26 | This enables Sound support for the Hammerhead board. You may |
| 27 | also go trough the ALSA settings to get it working. | 27 | also go through the ALSA settings to get it working. |
| 28 | 28 | ||
| 29 | Choose 'Y' here if you have ordered a Corona daugther board and | 29 | Choose 'Y' here if you have ordered a Corona daugther board and |
| 30 | want to make your board funky. | 30 | want to make your board funky. |