diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
| commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
| tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /arch/alpha/Kconfig | |
| parent | d8ce75324135ea7100124c1fff4ec5090a350607 (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge HEAD from ../linux-2.6
Diffstat (limited to 'arch/alpha/Kconfig')
| -rw-r--r-- | arch/alpha/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 8290b69da202..213c7850d5fb 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig | |||
| @@ -453,7 +453,7 @@ config ALPHA_IRONGATE | |||
| 453 | 453 | ||
| 454 | config GENERIC_HWEIGHT | 454 | config GENERIC_HWEIGHT |
| 455 | bool | 455 | bool |
| 456 | default y if !ALPHA_EV6 && !ALPHA_EV67 | 456 | default y if !ALPHA_EV67 |
| 457 | 457 | ||
| 458 | config ALPHA_AVANTI | 458 | config ALPHA_AVANTI |
| 459 | bool | 459 | bool |