diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/xtensa/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/xtensa/Kconfig')
| -rw-r--r-- | arch/xtensa/Kconfig | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 0859bfd8ae93..5d43c1f8ada8 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | # For a description of the syntax of this configuration file, | ||
| 2 | # see Documentation/kbuild/kconfig-language.txt. | ||
| 3 | |||
| 4 | mainmenu "Linux/Xtensa Kernel Configuration" | ||
| 5 | |||
| 6 | config FRAME_POINTER | 1 | config FRAME_POINTER |
| 7 | def_bool n | 2 | def_bool n |
| 8 | 3 | ||
| @@ -12,6 +7,8 @@ config ZONE_DMA | |||
| 12 | config XTENSA | 7 | config XTENSA |
| 13 | def_bool y | 8 | def_bool y |
| 14 | select HAVE_IDE | 9 | select HAVE_IDE |
| 10 | select HAVE_GENERIC_HARDIRQS | ||
| 11 | select GENERIC_IRQ_SHOW | ||
| 15 | help | 12 | help |
| 16 | Xtensa processors are 32-bit RISC machines designed by Tensilica | 13 | Xtensa processors are 32-bit RISC machines designed by Tensilica |
| 17 | primarily for embedded systems. These processors are both | 14 | primarily for embedded systems. These processors are both |
| @@ -23,15 +20,9 @@ config XTENSA | |||
| 23 | config RWSEM_XCHGADD_ALGORITHM | 20 | config RWSEM_XCHGADD_ALGORITHM |
| 24 | def_bool y | 21 | def_bool y |
| 25 | 22 | ||
| 26 | config GENERIC_FIND_NEXT_BIT | ||
| 27 | def_bool y | ||
| 28 | |||
| 29 | config GENERIC_HWEIGHT | 23 | config GENERIC_HWEIGHT |
| 30 | def_bool y | 24 | def_bool y |
| 31 | 25 | ||
| 32 | config GENERIC_HARDIRQS | ||
| 33 | def_bool y | ||
| 34 | |||
| 35 | config GENERIC_GPIO | 26 | config GENERIC_GPIO |
| 36 | def_bool y | 27 | def_bool y |
| 37 | 28 | ||