diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:11:34 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:11:34 -0400 |
| commit | 09fa31a322c8f03871a741cd1d26e5ca04aacbbd (patch) | |
| tree | acdad13d7c332978a91231c4f34b6320a1c7ceb6 /arch/arm/Kconfig.debug | |
| parent | 2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into highbank/soc
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Kconfig.debug')
| -rw-r--r-- | arch/arm/Kconfig.debug | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index b3dc1fa30848..0887801c324f 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
| @@ -158,4 +158,10 @@ config DEBUG_S3C_UART | |||
| 158 | The uncompressor code port configuration is now handled | 158 | The uncompressor code port configuration is now handled |
| 159 | by CONFIG_S3C_LOWLEVEL_UART_PORT. | 159 | by CONFIG_S3C_LOWLEVEL_UART_PORT. |
| 160 | 160 | ||
| 161 | config ARM_KPROBES_TEST | ||
| 162 | tristate "Kprobes test module" | ||
| 163 | depends on KPROBES && MODULES | ||
| 164 | help | ||
| 165 | Perform tests of kprobes API and instruction set simulation. | ||
| 166 | |||
| 161 | endmenu | 167 | endmenu |