From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date: Wed, 16 Jul 2008 12:06:15 +0000 (+0200)
Subject: [MIPS] IP22, IP28: Fix merge bug
X-Git-Tag: v2.6.27-rc1~967^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36e5c21de51e83bfa17c1e7334050edd2eda3d47;p=pandora-kernel.git

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

Reading git-diff-tree failed