diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
| commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
| tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /arch/Kconfig | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index d82875820a15..9d055b4f0585 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
| @@ -135,9 +135,7 @@ config HAVE_DEFAULT_NO_SPIN_MUTEXES | |||
| 135 | 135 | ||
| 136 | config HAVE_HW_BREAKPOINT | 136 | config HAVE_HW_BREAKPOINT |
| 137 | bool | 137 | bool |
| 138 | depends on HAVE_PERF_EVENTS | 138 | depends on PERF_EVENTS |
| 139 | select ANON_INODES | ||
| 140 | select PERF_EVENTS | ||
| 141 | 139 | ||
| 142 | config HAVE_USER_RETURN_NOTIFIER | 140 | config HAVE_USER_RETURN_NOTIFIER |
| 143 | bool | 141 | bool |