diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:39:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:39:09 -0400 |
| commit | b68c5f546e951d718edf611c4bd9853753e4b366 (patch) | |
| tree | 9ee71557445ee9ead299ac3e3a5e7d994ab30ad9 /arch/ia64/Kconfig | |
| parent | b0fea350ce515c6ae01e0f259d9b1ffdec824e22 (diff) | |
| parent | 95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 674de8943478..db274da7dba1 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -75,6 +75,10 @@ config DMA_IS_NORMAL | |||
| 75 | depends on IA64_SGI_SN2 | 75 | depends on IA64_SGI_SN2 |
| 76 | default y | 76 | default y |
| 77 | 77 | ||
| 78 | config AUDIT_ARCH | ||
| 79 | bool | ||
| 80 | default y | ||
| 81 | |||
| 78 | choice | 82 | choice |
| 79 | prompt "System type" | 83 | prompt "System type" |
| 80 | default IA64_GENERIC | 84 | default IA64_GENERIC |