mirror of
https://github.com/joel16/android_kernel_sony_msm8994_rework.git
synced 2024-12-27 06:25:34 +00:00
DDB5477: remove driver bits of support
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
57d4810ea0
commit
5b232ecfd9
@ -1471,14 +1471,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
|
||||
sa_offset = 2; /* Grrr, damn Matrox boards. */
|
||||
multiport_cnt = 4;
|
||||
}
|
||||
#ifdef CONFIG_DDB5477
|
||||
if ((pdev->bus->number == 0) && (PCI_SLOT(pdev->devfn) == 4)) {
|
||||
/* DDB5477 MAC address in first EEPROM locations. */
|
||||
sa_offset = 0;
|
||||
/* No media table either */
|
||||
tp->flags &= ~HAS_MEDIA_TABLE;
|
||||
}
|
||||
#endif
|
||||
#ifdef CONFIG_MIPS_COBALT
|
||||
if ((pdev->bus->number == 0) &&
|
||||
((PCI_SLOT(pdev->devfn) == 7) ||
|
||||
|
@ -976,7 +976,6 @@ enum pci_board_num_t {
|
||||
pbn_oxsemi,
|
||||
pbn_intel_i960,
|
||||
pbn_sgi_ioc3,
|
||||
pbn_nec_nile4,
|
||||
pbn_computone_4,
|
||||
pbn_computone_6,
|
||||
pbn_computone_8,
|
||||
@ -1442,18 +1441,6 @@ static struct pciserial_board pci_boards[] __devinitdata = {
|
||||
.first_offset = 0x20178,
|
||||
},
|
||||
|
||||
/*
|
||||
* NEC Vrc-5074 (Nile 4) builtin UART.
|
||||
*/
|
||||
[pbn_nec_nile4] = {
|
||||
.flags = FL_BASE0,
|
||||
.num_ports = 1,
|
||||
.base_baud = 520833,
|
||||
.uart_offset = 8 << 3,
|
||||
.reg_shift = 3,
|
||||
.first_offset = 0x300,
|
||||
},
|
||||
|
||||
/*
|
||||
* Computone - uses IOMEM.
|
||||
*/
|
||||
@ -2345,13 +2332,6 @@ static struct pci_device_id serial_pci_tbl[] = {
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b2_1_115200 },
|
||||
|
||||
/*
|
||||
* NEC Vrc-5074 (Nile 4) builtin UART.
|
||||
*/
|
||||
{ PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NILE4,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_nec_nile4 },
|
||||
|
||||
{ PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM2,
|
||||
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
pbn_b3_2_115200 },
|
||||
|
@ -611,7 +611,6 @@
|
||||
#define PCI_DEVICE_ID_NEC_CBUS_3 0x003b
|
||||
#define PCI_DEVICE_ID_NEC_NAPCCARD 0x003e
|
||||
#define PCI_DEVICE_ID_NEC_PCX2 0x0046 /* PowerVR */
|
||||
#define PCI_DEVICE_ID_NEC_NILE4 0x005a
|
||||
#define PCI_DEVICE_ID_NEC_VRC5476 0x009b
|
||||
#define PCI_DEVICE_ID_NEC_VRC4173 0x00a5
|
||||
#define PCI_DEVICE_ID_NEC_VRC5477_AC97 0x00a6
|
||||
|
@ -31,14 +31,6 @@ config SOUND_HAL2
|
||||
Say Y or M if you have an SGI Indy or Indigo2 system and want to be able to
|
||||
use its on-board A2 audio system.
|
||||
|
||||
config SOUND_VRC5477
|
||||
tristate "NEC Vrc5477 AC97 sound"
|
||||
depends on SOUND_PRIME && DDB5477
|
||||
help
|
||||
Say Y here to enable sound support for the NEC Vrc5477 chip, an
|
||||
integrated, multi-function controller chip for MIPS CPUs. Works
|
||||
with the AC97 codec.
|
||||
|
||||
config SOUND_AU1550_AC97
|
||||
tristate "Au1550/Au1200 AC97 Sound"
|
||||
select SND_AC97_CODEC
|
||||
|
@ -37,7 +37,6 @@ obj-$(CONFIG_SOUND_MSNDPIN) += msnd.o msnd_pinnacle.o
|
||||
obj-$(CONFIG_SOUND_VWSND) += vwsnd.o
|
||||
obj-$(CONFIG_SOUND_ICH) += i810_audio.o ac97_codec.o
|
||||
obj-$(CONFIG_SOUND_ES1371) += es1371.o ac97_codec.o
|
||||
obj-$(CONFIG_SOUND_VRC5477) += nec_vrc5477.o ac97_codec.o
|
||||
obj-$(CONFIG_SOUND_AU1550_AC97) += au1550_ac97.o ac97_codec.o
|
||||
obj-$(CONFIG_SOUND_TRIDENT) += trident.o ac97_codec.o
|
||||
obj-$(CONFIG_SOUND_BCM_CS4297A) += swarm_cs4297a.o
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user