Received: from mail.onstor.com ([66.201.51.107]) by onstor-exch02.onstor.net with Microsoft SMTPSVC(6.0.3790.1830);
	 Wed, 16 Jul 2008 05:06:45 -0700
Received: from chiesmta2-2.messageone.com ([216.203.30.55]) by mail.onstor.com with Microsoft SMTPSVC(6.0.3790.1830);
	 Wed, 16 Jul 2008 05:06:44 -0700
Received: from ftp.linux-mips.org (ftp.linux-mips.org [213.58.128.207])
	by chiesmta2-2.messageone.com (8.13.8/8.13.8) with ESMTP id m6GC6het012864
	for <andy.sharp@onstor.com>; Wed, 16 Jul 2008 07:06:43 -0500
Received: from localhost.localdomain ([127.0.0.1]:52880 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP
	id S28580284AbYGPMGj (ORCPT <rfc822;andy.sharp@onstor.com>);
	Wed, 16 Jul 2008 13:06:39 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 16 Jul 2008 13:06:22 +0100 (BST)
Received: from elvis.franken.de ([193.175.24.41]:38349 "EHLO elvis.franken.de")
	by ftp.linux-mips.org with ESMTP id S28580210AbYGPMGU (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Wed, 16 Jul 2008 13:06:20 +0100
Received: from uucp (helo=solo.franken.de)
	by elvis.franken.de with local-bsmtp (Exim 3.36 #1)
	id 1KJ5lz-0005YL-00; Wed, 16 Jul 2008 14:06:19 +0200
Received: by solo.franken.de (Postfix, from userid 1000)
	id ECBF2C2B2E; Wed, 16 Jul 2008 14:06:15 +0200 (CEST)
From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Subject: [PATCH] Fix merge bug
To: linux-mips@linux-mips.org
cc: ralf@linux-mips.org
Message-Id: <20080716120615.ECBF2C2B2E@solo.franken.de>
Date: 	Wed, 16 Jul 2008 14:06:15 +0200 (CEST)
X-archive-position: 19856
X-ecartis-version: Ecartis v1.0.0
Sender: linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
X-original-sender: tsbogend@alpha.franken.de
Precedence: bulk
X-list: 	linux-mips
X-MessageOne-Virus-Version: vendor=fsecure engine=4.65.7161:2.4.4,1.2.40,4.0.164 definitions=2008-07-16_04:2008-07-15,2008-07-16,2008-07-16 signatures=0
X-MessageOne-Virus-Scanned: Clean
X-MessageOne-Envelope-Sender: linux-mips-bounce@linux-mips.org
X-MessageOne-Spam-Details: rule=m773emszm_notspam policy=m773emszm score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=3.1.0-0805090000 definitions=main-0807160029
X-MessageOne-Spam-Score: 0
X-MessageOne-Spam-Bar: 
Return-Path: linux-mips-bounce@linux-mips.org
X-OriginalArrivalTime: 16 Jul 2008 12:06:44.0985 (UTC) FILETIME=[6A702E90:01C8E73C]

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

 arch/mips/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d21df5f..30edc39 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -330,6 +330,7 @@ config SGI_IP22
 	select SGI_HAS_DS1286
 	select SGI_HAS_I8042
 	select SGI_HAS_INDYDOG
+	select SGI_HAS_HAL2
 	select SGI_HAS_SEEQ
 	select SGI_HAS_WD93
 	select SGI_HAS_ZILOG
@@ -386,7 +387,6 @@ config SGI_IP28
 	select SGI_HAS_I8042
 	select SGI_HAS_INDYDOG
 	select SGI_HAS_HAL2
-	select SGI_HAS_HAL2
 	select SGI_HAS_SEEQ
 	select SGI_HAS_WD93
 	select SGI_HAS_ZILOG

