* [PATCH] Fix merge bug
@ 2008-07-16 12:06 Thomas Bogendoerfer
2008-07-16 12:21 ` Ralf Baechle
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Bogendoerfer @ 2008-07-16 12:06 UTC (permalink / raw)
To: linux-mips; +Cc: ralf
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix merge bug
2008-07-16 12:06 [PATCH] Fix merge bug Thomas Bogendoerfer
@ 2008-07-16 12:21 ` Ralf Baechle
0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2008-07-16 12:21 UTC (permalink / raw)
To: Thomas Bogendoerfer; +Cc: linux-mips
On Wed, Jul 16, 2008 at 02:06:15PM +0200, Thomas Bogendoerfer wrote:
> 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>
Thanks, applied.
Ralf
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-07-16 12:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-16 12:06 [PATCH] Fix merge bug Thomas Bogendoerfer
2008-07-16 12:21 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox