Thomas Bogendoerfer 36e5c21de5 [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>

2008-07-20 14:38:18 +01:00

..

au1000

[MIPS] MTX-1 flash partition setup move to platform devices registration

2008-07-15 18:44:38 +01:00

basler/excite

basler-excite: BKL pushdown

2008-06-20 14:05:54 -06:00

bcm47xx

[MIPS] BCM47XX: Use new SSB SPROM data structure

2008-02-19 17:01:34 +00:00

boot

[MIPS] checkfiles: Fix "need space after that ','" errors.

2007-10-11 23:46:15 +01:00

cobalt

[MIPS] Cobalt: Register new LCD platform device.

2008-07-15 18:44:31 +01:00

configs

[MIPS] TXx9: Update and merge defconfigs

2008-07-15 18:44:36 +01:00

dec

[MIPS] DS1287: Add clockevent driver

2008-04-28 17:14:32 +01:00

emma2rh

[MIPS] Remove mips_machtype from EMMA2RH machines

2008-07-15 18:44:39 +01:00

fw

[MIPS] Remove mips_machtype from ARC based machines

2008-07-15 18:44:38 +01:00

gt64120/wrppmc

[MIPS] remove wrppmc_machine_power_off()

2008-07-15 18:44:36 +01:00

jazz

[MIPS] Remove mips_machtype from ARC based machines

2008-07-15 18:44:38 +01:00

kernel

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

2008-07-15 15:01:29 -07:00

lasat

[MIPS] Remove mips_machtype for LASAT machines

2008-07-15 18:44:39 +01:00

lemote/lm2e

[MIPS] Fulong: don't reinitialize pci_probe_only to it's default value.

2008-01-29 10:14:59 +00:00

lib

iomap: fix 64 bits resources on 32 bits

2008-04-29 08:06:02 -07:00

math-emu

[MIPS] Fix missing prototypes in asm/fpu.h

2008-07-20 14:38:17 +01:00

mipssim

[MIPS] Remove TLB sanitation code

2008-04-28 17:14:25 +01:00

mm

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

2008-07-15 15:01:29 -07:00

mti-malta

[MIPS] Malta: Cleanup organization of code into directories.

2008-07-15 18:44:34 +01:00

nxp/pnx8550

[MIPS] Alchemy, PNX: Use symbolic constants for DMA masks.

2008-07-15 18:44:29 +01:00

oprofile

generic-ipi: more merge fallout

2008-07-15 22:08:52 +02:00

pci

[MIPS] PCI: Make the pcibios_max_latency variable static

2008-07-20 14:38:17 +01:00

pmc-sierra

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2008-07-16 17:25:46 -07:00

sgi-ip22

[MIPS] IP22: Add platform device for Indy volume buttons

2008-07-15 18:44:37 +01:00

sgi-ip27

[MIPS] Replace use of print_symbol with new %sP pointer format.

2008-07-15 18:44:33 +01:00

sgi-ip32

[MIPS] IP32: Add platform devices for audio and volume button

2008-07-15 18:44:32 +01:00

sibyte

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15 21:55:59 +02:00

sni

[MIPS] Remove obsolete isa_slot_offset

2008-07-15 18:44:29 +01:00

txx9

[MIPS] TXx9: cleanup and fix some sparse warnings

2008-07-15 18:44:38 +01:00

vr41xx

[MIPS] cmbvr4133: Remove support

2008-07-15 18:44:36 +01:00

Kconfig

[MIPS] IP22, IP28: Fix merge bug

2008-07-20 14:38:18 +01:00

Kconfig.debug

[MIPS] Allow setting of the cache attribute at run time.

2008-04-28 17:14:25 +01:00

Makefile

[MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx

2008-07-15 18:44:38 +01:00