summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sound/soc/zte/Kconfig16
-rw-r--r--sound/soc/zte/Makefile4
-rw-r--r--sound/soc/zte/zx-i2s.c (renamed from sound/soc/zte/zx296702-i2s.c)0
-rw-r--r--sound/soc/zte/zx-spdif.c (renamed from sound/soc/zte/zx296702-spdif.c)0
4 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/zte/Kconfig b/sound/soc/zte/Kconfig
index c47eb25e441f..6d8a90d36315 100644
--- a/sound/soc/zte/Kconfig
+++ b/sound/soc/zte/Kconfig
@@ -1,17 +1,17 @@
-config ZX296702_SPDIF
- tristate "ZX296702 spdif"
- depends on SOC_ZX296702 || COMPILE_TEST
+config ZX_SPDIF
+ tristate "ZTE ZX SPDIF Driver Support"
+ depends on ARCH_ZX || COMPILE_TEST
depends on COMMON_CLK
select SND_SOC_GENERIC_DMAENGINE_PCM
help
Say Y or M if you want to add support for codecs attached to the
- zx296702 spdif interface
+ ZTE ZX SPDIF interface
-config ZX296702_I2S
- tristate "ZX296702 i2s"
- depends on SOC_ZX296702 || COMPILE_TEST
+config ZX_I2S
+ tristate "ZTE ZX I2S Driver Support"
+ depends on ARCH_ZX || COMPILE_TEST
depends on COMMON_CLK
select SND_SOC_GENERIC_DMAENGINE_PCM
help
Say Y or M if you want to add support for codecs attached to the
- zx296702 i2s interface
+ ZTE ZX I2S interface
diff --git a/sound/soc/zte/Makefile b/sound/soc/zte/Makefile
index 254ed2c8c1a0..77768f5fd10c 100644
--- a/sound/soc/zte/Makefile
+++ b/sound/soc/zte/Makefile
@@ -1,2 +1,2 @@
-obj-$(CONFIG_ZX296702_SPDIF) += zx296702-spdif.o
-obj-$(CONFIG_ZX296702_I2S) += zx296702-i2s.o
+obj-$(CONFIG_ZX_SPDIF) += zx-spdif.o
+obj-$(CONFIG_ZX_I2S) += zx-i2s.o
diff --git a/sound/soc/zte/zx296702-i2s.c b/sound/soc/zte/zx-i2s.c
index 1cad93dc1fcf..1cad93dc1fcf 100644
--- a/sound/soc/zte/zx296702-i2s.c
+++ b/sound/soc/zte/zx-i2s.c
diff --git a/sound/soc/zte/zx296702-spdif.c b/sound/soc/zte/zx-spdif.c
index 26265ce4caca..26265ce4caca 100644
--- a/sound/soc/zte/zx296702-spdif.c
+++ b/sound/soc/zte/zx-spdif.c
td>2009-03-13parisc: fix wrong assumption about bus->selfGrant Grundler 2009-03-13parisc: remove klist iteratorsJames Bottomley 2009-01-29Documentation: move DMA-mapping.txt to Doc/PCI/Randy Dunlap 2009-01-13fix early_serial_setup() regressionHelge Deller 2009-01-09Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6Linus Torvalds 2009-01-07PCI: parisc: use generic pci_swizzle_interrupt_pin()Bjorn Helgaas 2009-01-05parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitionsFUJITA Tomonori 2009-01-05parisc: drivers/parisc/: make code staticAdrian Bunk 2009-01-02Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds 2008-12-13cpumask: make irq_set_affinity() take a const struct cpumaskRusty Russell 2008-11-19netdev: introduce dev_get_stats()Stephen Hemminger 2008-10-21[PATCH] introduce fmode_t, do annotationsAl Viro 2008-10-20Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6Linus Torvalds 2008-10-16generic: sparse irqs: use irq_desc() together with dyn_array, instead of irq_...Yinghai Lu 2008-10-10parisc: unify CCIO_COLLECT_STATS implementationKyle McMartin 2008-07-02parisc-eisa_eeprom: BKL pushdownArnd Bergmann 2008-05-15drivers/parisc: replace remaining __FUNCTION__ occurrencesHarvey Harrison 2008-04-29parisc: use non-racy method for proc entries creationDenis V. Lunev 2008-04-20PCI: remove parisc consumer of the pci global_listJames Bottomley 2008-03-15[PARISC] make ptr_to_pide() staticFUJITA Tomonori 2008-03-15[PARISC] pdc_stable: fix compile errorsJoel Soete 2008-03-05parisc: fix IOMMU's device boundary overflow bug on 32bits archFUJITA Tomonori 2008-03-04iommu: parisc: make the IOMMUs respect the segment boundary limitsFUJITA Tomonori 2008-03-04iommu: parisc: pass struct device to iommu_alloc_rangeFUJITA Tomonori