diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /arch/mips/Kconfig | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 548e6cc3bc28..f5ecc0566bc2 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -793,9 +793,6 @@ config SCHED_OMIT_FRAME_POINTER | |||
| 793 | bool | 793 | bool |
| 794 | default y | 794 | default y |
| 795 | 795 | ||
| 796 | config GENERIC_HARDIRQS_NO__DO_IRQ | ||
| 797 | def_bool y | ||
| 798 | |||
| 799 | # | 796 | # |
| 800 | # Select some configuration options automatically based on user selections. | 797 | # Select some configuration options automatically based on user selections. |
| 801 | # | 798 | # |