err.no Git - linux-2.6/commit

author	Thomas Bogendoerfer <tsbogend@alpha.franken.de>
	Wed, 16 Jul 2008 12:06:15 +0000 (14:06 +0200)
committer	Ralf Baechle <ralf@linux-mips.org>
	Sun, 20 Jul 2008 13:38:18 +0000 (14:38 +0100)
commit	36e5c21de51e83bfa17c1e7334050edd2eda3d47
tree	aa49e703fd9762383390896e13a8a1e003d283bf	tree \| snapshot
parent	d6d8a4635a8451ca3c6fa2aaf9bbf934d8e2097b	commit \| 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>