diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-31 02:39:47 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-31 02:39:47 -0400 |
| commit | 7ea5db8efeac8627500e012aa6829ca612c5a700 (patch) | |
| tree | 90e4de22f60b989dcf0f0d7436978c0b463d5827 /arch/blackfin/Kconfig | |
| parent | eee7631fdf8ae63c4f24daf66981ac1a7b55d7fd (diff) | |
| parent | 6aba74f2791287ec407e0f92487a725a25908067 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/blackfin/Kconfig')
| -rw-r--r-- | arch/blackfin/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 672c21632f2f..8addb1220b4f 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -34,7 +34,6 @@ config BLACKFIN | |||
| 34 | select GENERIC_ATOMIC64 | 34 | select GENERIC_ATOMIC64 |
| 35 | select GENERIC_IRQ_PROBE | 35 | select GENERIC_IRQ_PROBE |
| 36 | select IRQ_PER_CPU if SMP | 36 | select IRQ_PER_CPU if SMP |
| 37 | select GENERIC_HARDIRQS_NO_DEPRECATED | ||
| 38 | 37 | ||
| 39 | config GENERIC_CSUM | 38 | config GENERIC_CSUM |
| 40 | def_bool y | 39 | def_bool y |