首頁 探索 說明
註冊 登入
phyus
/
linux-vybrid_public
8
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

[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>
Thomas Bogendoerfer 17 年之前
父節點
d6d8a4635a
當前提交
36e5c21de5
共有 1 個文件被更改，包括 1 次插入 和 1 次删除
統一視圖 顯示文件統計
  1. 1 1
      arch/mips/Kconfig

+ 1 - 1
arch/mips/Kconfig
查看文件 

@@ -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
 
 	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