Commit 36e5c21d authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Ralf Baechle

[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: default avatarThomas 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: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent d6d8a463
...@@ -330,6 +330,7 @@ config SGI_IP22 ...@@ -330,6 +330,7 @@ config SGI_IP22
select SGI_HAS_DS1286 select SGI_HAS_DS1286
select SGI_HAS_I8042 select SGI_HAS_I8042
select SGI_HAS_INDYDOG select SGI_HAS_INDYDOG
select SGI_HAS_HAL2
select SGI_HAS_SEEQ select SGI_HAS_SEEQ
select SGI_HAS_WD93 select SGI_HAS_WD93
select SGI_HAS_ZILOG select SGI_HAS_ZILOG
...@@ -386,7 +387,6 @@ config SGI_IP28 ...@@ -386,7 +387,6 @@ config SGI_IP28
select SGI_HAS_I8042 select SGI_HAS_I8042
select SGI_HAS_INDYDOG select SGI_HAS_INDYDOG
select SGI_HAS_HAL2 select SGI_HAS_HAL2
select SGI_HAS_HAL2
select SGI_HAS_SEEQ select SGI_HAS_SEEQ
select SGI_HAS_WD93 select SGI_HAS_WD93
select SGI_HAS_ZILOG select SGI_HAS_ZILOG
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment