diff options
author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2008-07-16 08:06:15 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-20 09:38:18 -0400 |
commit | 36e5c21de51e83bfa17c1e7334050edd2eda3d47 (patch) | |
tree | aa49e703fd9762383390896e13a8a1e003d283bf /arch/mips/Kconfig | |
parent | d6d8a4635a8451ca3c6fa2aaf9bbf934d8e2097b (diff) |
[MIPS] IP22, IP28: Fix merge bug
Instead of one SGI_HAS_HAL2 for IP22 and one for IP28, IP28 got two of
them... Let's give IP22 some ALSA sound, too.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>[MIPS] IP22, IP28: Fix merge bug
Instead of one SGI_HAS_HAL2 for IP22 and one for IP28, IP28 got two of
them... Let's give IP22 some ALSA sound, too.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index d21df5f1b1f3..30edc395dce7 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -330,6 +330,7 @@ config SGI_IP22 | |||
330 | select SGI_HAS_DS1286 | 330 | select SGI_HAS_DS1286 |
331 | select SGI_HAS_I8042 | 331 | select SGI_HAS_I8042 |
332 | select SGI_HAS_INDYDOG | 332 | select SGI_HAS_INDYDOG |
333 | select SGI_HAS_HAL2 | ||
333 | select SGI_HAS_SEEQ | 334 | select SGI_HAS_SEEQ |
334 | select SGI_HAS_WD93 | 335 | select SGI_HAS_WD93 |
335 | select SGI_HAS_ZILOG | 336 | select SGI_HAS_ZILOG |
@@ -386,7 +387,6 @@ config SGI_IP28 | |||
386 | select SGI_HAS_I8042 | 387 | select SGI_HAS_I8042 |
387 | select SGI_HAS_INDYDOG | 388 | select SGI_HAS_INDYDOG |
388 | select SGI_HAS_HAL2 | 389 | select SGI_HAS_HAL2 |
389 | select SGI_HAS_HAL2 | ||
390 | select SGI_HAS_SEEQ | 390 | select SGI_HAS_SEEQ |
391 | select SGI_HAS_WD93 | 391 | select SGI_HAS_WD93 |
392 | select SGI_HAS_ZILOG | 392 | select SGI_HAS_ZILOG |