diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-16 14:18:46 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-16 14:18:46 +0000 |
commit | 32d40f0cb312c3835a6e52256a60cd5507f8ed4d (patch) | |
tree | bfdd2ac9b43e506b8e72c5d8786a998d04d8d755 | |
parent | 82b04af1bae93f7f8aa76248592f1bc11e6f3e7e (diff) |
Revert "ARM: random randconfig fixes for testing multiplatform"tracking-multiplatform-llct-20120820.1tracking-multiplatform-llct-20120820.0tracking-multiplatform-llct-20120816.0
This reverts commit 82b04af1bae93f7f8aa76248592f1bc11e6f3e7e.
35 files changed, 45 insertions, 91 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0f80ed870c5d..1781db15358f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -262,7 +262,6 @@ config ARCH_MULTIPLATFORM select SPARSE_IRQ select MULTI_IRQ_HANDLER select AUTO_ZRELADDR - select ARM_PATCH_PHYS_VIRT depends on MMU config ARCH_SOCFPGA diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index c0b93aa127f1..11b9ff446cc2 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -392,7 +392,6 @@ config OC_ETM config ARM_KPROBES_TEST tristate "Kprobes test module" depends on KPROBES && MODULES - depends on CPU_V6 || CPU_V7 help Perform tests of kprobes API and instruction set simulation. diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index f91bb4b90494..aed2eeb06517 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -13,7 +13,6 @@ #define __ARCH_ARM_MACH_EXYNOS_COMMON_H extern struct sys_timer exynos4_timer; -struct map_desc; void exynos_init_io(struct map_desc *mach_desc, int size); void exynos4_init_irq(void); diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 493047e259e2..de3c17f096c9 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -89,7 +89,6 @@ config SOC_IMX5 select ARCH_MXC_IOMUX_V3 select ARCH_HAS_CPUFREQ select ARCH_MX5 - select ARM_CPU_SUSPEND if PM bool config SOC_IMX50 @@ -487,7 +486,6 @@ config MACH_MX31_3DS select IMX_HAVE_PLATFORM_MXC_MMC select IMX_HAVE_PLATFORM_MXC_NAND select IMX_HAVE_PLATFORM_SPI_IMX - select IMX_HAVE_PLATFORM_IMX_SSI select MXC_ULPI if USB_ULPI help Include support for MX31PDK (3DS) platform. This includes specific diff --git a/arch/arm/mach-multi/Kconfig b/arch/arm/mach-multi/Kconfig index 906a470b7a83..b00e08082d27 100644 --- a/arch/arm/mach-multi/Kconfig +++ b/arch/arm/mach-multi/Kconfig @@ -38,6 +38,24 @@ config ARCH_MULTI_CPU_AUTO select ARCH_MULTI_V5 comment "SoC family selection" + +config ARCH_MULTI_VEXPRESS + bool "ARM Ltd. Versatile Express family" + depends on ARCH_MULTI_V7 + select ARCH_VEXPRESS + select ARCH_VEXPRESS_DT + select ARCH_VEXPRESS_CA9X4 + select ARCH_WANT_OPTIONAL_GPIOLIB + select ARM_AMBA + select ARM_TIMER_SP804 + select CLKDEV_LOOKUP + select GENERIC_CLOCKEVENTS + select HAVE_CLK + select HAVE_PATA_PLATFORM + select ICST + select PLAT_VERSATILE + select PLAT_VERSATILE_CLCD + config ARCH_MULTI_OMAP2PLUS bool select ARCH_OMAP @@ -149,21 +167,4 @@ config ARCH_MULTI_AUTOSELECT select ARCH_MULTI_VEXPRESS if ARCH_MULTI_V6_V7 select ARCH_MULTI_IMX2 if ARCH_MULTI_V4_V5 -config ARCH_MULTI_VEXPRESS - bool "ARM Ltd. Versatile Express family" - depends on ARCH_MULTI_V7 - select ARCH_VEXPRESS - select ARCH_VEXPRESS_DT - select ARCH_VEXPRESS_CA9X4 - select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_AMBA - select ARM_TIMER_SP804 - select CLKDEV_LOOKUP - select GENERIC_CLOCKEVENTS - select HAVE_CLK - select HAVE_PATA_PLATFORM - select ICST - select PLAT_VERSATILE - select PLAT_VERSATILE_CLCD - endmenu diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c index 11b38f52890a..c76f0f456f04 100644 --- a/arch/arm/mach-ux500/hotplug.c +++ b/arch/arm/mach-ux500/hotplug.c @@ -23,8 +23,8 @@ static inline void platform_do_lowpower(unsigned int cpu) /* we put the platform to just WFI */ for (;;) { - dsb(); - wfi(); + __asm__ __volatile__("dsb\n\t" "wfi\n\t" + : : : "memory"); if (pen_release == cpu_logical_map(cpu)) { /* * OK, proper wakeup, we're done diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index 030d998a7f60..a54d863e71bd 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -66,7 +66,6 @@ config HAVE_EPIT config MXC_USE_EPIT bool "Use EPIT instead of GPT" depends on HAVE_EPIT - depends on BROKEN help Use EPIT as the system timer on systems that have it. Normally you don't have a reason to do so as the EPIT has the same features and diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c index 3d6c4a6411c3..2450ab4c5915 100644 --- a/arch/arm/plat-omap/debug-leds.c +++ b/arch/arm/plat-omap/debug-leds.c @@ -62,7 +62,6 @@ static u16 led_state, hw_led_state; #define GPIO_IDLE GPIO_LED_GREEN #define GPIO_TIMER GPIO_LED_RED -#ifdef CONFIG_LEDS static void h2p2_dbg_leds_event(led_event_t evt) { unsigned long flags; @@ -180,7 +179,6 @@ static void h2p2_dbg_leds_event(led_event_t evt) done: spin_unlock_irqrestore(&lock, flags); } -#endif /*-------------------------------------------------------------------------*/ diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index d2684ca0afab..ece2985bbede 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -192,8 +192,8 @@ config DMA_SHARED_BUFFER driver. config CMA - bool "Contiguous Memory Allocator" - depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK + bool "Contiguous Memory Allocator (EXPERIMENTAL)" + depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK && EXPERIMENTAL select MIGRATION select MEMORY_ISOLATION help diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 50e1f5c798da..c6440a5651e1 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -494,7 +494,6 @@ static int pxa_gpio_nums(void) return count; } -#ifdef CONFIG_OF static struct of_device_id pxa_gpio_dt_ids[] = { { .compatible = "mrvl,pxa-gpio" }, { .compatible = "mrvl,mmp-gpio", .data = (void *)MMP_GPIO }, @@ -514,6 +513,7 @@ const struct irq_domain_ops pxa_irq_domain_ops = { .map = pxa_irq_domain_map, }; +#ifdef CONFIG_OF static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev) { int ret, nr_banks, nr_gpios, irq_base; @@ -659,7 +659,7 @@ static struct platform_driver pxa_gpio_driver = { .probe = pxa_gpio_probe, .driver = { .name = "pxa-gpio", - .of_match_table = of_match_ptr(pxa_gpio_dt_ids), + .of_match_table = pxa_gpio_dt_ids, }, }; diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c index 368c807ec6e1..1e48bec80edf 100644 --- a/drivers/i2c/busses/i2c-designware-core.c +++ b/drivers/i2c/busses/i2c-designware-core.c @@ -33,7 +33,6 @@ #include <linux/io.h> #include <linux/pm_runtime.h> #include <linux/delay.h> -#include <linux/module.h> #include "i2c-designware-core.h" /* diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 8e6a78402a3c..0506fef8dc00 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -199,7 +199,7 @@ static const struct of_device_id dw_i2c_of_match[] = { MODULE_DEVICE_TABLE(of, dw_i2c_of_match); #endif -#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_PM static int dw_i2c_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig index ec8e5898a1da..d4984c8be973 100644 --- a/drivers/iio/Kconfig +++ b/drivers/iio/Kconfig @@ -5,7 +5,6 @@ menuconfig IIO tristate "Industrial I/O support" depends on GENERIC_HARDIRQS - select ANON_INODES help The industrial I/O subsystem provides a unified framework for drivers for many different types of embedded sensors using a diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c index 6283e2aa07b3..fbc12acada95 100644 --- a/drivers/leds/leds-lp5523.c +++ b/drivers/leds/leds-lp5523.c @@ -243,9 +243,7 @@ static int lp5523_configure(struct i2c_client *client) /* Let the programs run for couple of ms and check the engine status */ usleep_range(3000, 6000); - ret = lp5523_read(client, LP5523_REG_STATUS, &status); - if (ret) - return ret; + lp5523_read(client, LP5523_REG_STATUS, &status); status &= LP5523_ENG_STATUS_MASK; if (status == LP5523_ENG_STATUS_MASK) { diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig index 0a2de7b12a97..23f7fd22f0eb 100644 --- a/drivers/media/video/au0828/Kconfig +++ b/drivers/media/video/au0828/Kconfig @@ -2,11 +2,11 @@ config VIDEO_AU0828 tristate "Auvitek AU0828 support" depends on I2C && INPUT && DVB_CORE && USB && VIDEO_V4L2 - depends on DVB_AU8522_DTV depends on DVB_CAPTURE_DRIVERS select I2C_ALGOBIT select VIDEO_TVEEPROM select VIDEOBUF_VMALLOC + select DVB_AU8522_DTV if !DVB_FE_CUSTOMISE select DVB_AU8522_V4L if !DVB_FE_CUSTOMISE select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMISE select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMISE diff --git a/drivers/media/video/smiapp/smiapp-core.c b/drivers/media/video/smiapp/smiapp-core.c index 80b973f3485a..bfd47c106134 100644 --- a/drivers/media/video/smiapp/smiapp-core.c +++ b/drivers/media/video/smiapp/smiapp-core.c @@ -34,7 +34,6 @@ #include <linux/slab.h> #include <linux/regulator/consumer.h> #include <linux/v4l2-mediabus.h> -#include <linux/slab.h> #include <media/v4l2-device.h> #include "smiapp.h" diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 4b50ec21dbb4..129a8c244168 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -302,7 +302,7 @@ config MFD_TWL4030_AUDIO config TWL6030_PWM tristate "TWL6030 PWM (Pulse Width Modulator) Support" depends on TWL4030_CORE - depends on MXC_PWM=n + depends on !AB8500_PWM select HAVE_PWM depends on !PWM default n diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c index 7637ffe78aac..cdc1df7fa0e9 100644 --- a/drivers/mfd/rc5t583.c +++ b/drivers/mfd/rc5t583.c @@ -97,7 +97,7 @@ static int __rc5t583_set_ext_pwrreq1_control(struct device *dev, en_bit = deepsleep_data[id].ds_pos_bit; slot_bit = en_bit + 1; ret = rc5t583_read(dev, deepsleep_data[id].reg_add, &sleepseq_val); - if (ret) { + if (ret < 0) { dev_err(dev, "Error in reading reg 0x%x\n", deepsleep_data[id].reg_add); return ret; diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c index 5529c6638852..eec74aa55fdf 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c @@ -405,7 +405,7 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq) struct regmap_config *regmap_config; const struct reg_default *regmap_patch = NULL; const char *devname; - int ret, i, uninitialized_var(patch_regs); + int ret, i, patch_regs; int pulls = 0; dev_set_drvdata(wm8994->dev, wm8994); diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index ea726212d6b3..98a442da892a 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -63,7 +63,6 @@ config ATMEL_PWM config AB8500_PWM bool "AB8500 PWM support" depends on AB8500_CORE && ARCH_U8500 - depends on !TWL6030_PWM && !MXC_PWM select HAVE_PWM depends on !PWM help diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 79573eb085c8..72dc3cde646d 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -11,6 +11,7 @@ * (at your option) any later version. */ +#include <linux/blkdev.h> #include <linux/clk.h> #include <linux/debugfs.h> #include <linux/device.h> @@ -1759,7 +1760,7 @@ static void dw_mci_work_routine_card(struct work_struct *work) } } -static int __devinit dw_mci_init_slot(struct dw_mci *host, unsigned int id) +static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) { struct mmc_host *mmc; struct dw_mci_slot *slot; @@ -1934,7 +1935,7 @@ static bool mci_wait_reset(struct device *dev, struct dw_mci *host) return false; } -int __devinit dw_mci_probe(struct dw_mci *host) +int dw_mci_probe(struct dw_mci *host) { int width, i, ret = 0; u32 fifo_size; diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig index 315c3512dff4..4cdb2af7bf44 100644 --- a/drivers/mtd/devices/Kconfig +++ b/drivers/mtd/devices/Kconfig @@ -264,7 +264,6 @@ config MTD_DOCG3 tristate "M-Systems Disk-On-Chip G3" select BCH select BCH_CONST_PARAMS - select BITREVERSE ---help--- This provides an MTD device driver for the M-Systems DiskOnChip G3 devices. diff --git a/drivers/net/wireless/ath/carl9170/Kconfig b/drivers/net/wireless/ath/carl9170/Kconfig index 1f1ba8fd689e..267d5dcf82dc 100644 --- a/drivers/net/wireless/ath/carl9170/Kconfig +++ b/drivers/net/wireless/ath/carl9170/Kconfig @@ -1,7 +1,6 @@ config CARL9170 tristate "Linux Community AR9170 802.11n USB support" depends on USB && MAC80211 && EXPERIMENTAL - select BITREVERSE select FW_LOADER select CRC32 help diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 1faa6ae3dda4..72548609f711 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -1426,7 +1426,6 @@ int wl1271_rx_filter_alloc_field(struct wl12xx_rx_filter *filter, return 0; } -#endif int wl1271_rx_filter_get_fields_size(struct wl12xx_rx_filter *filter) { @@ -1459,7 +1458,6 @@ void wl1271_rx_filter_flatten_fields(struct wl12xx_rx_filter *filter, } } -#ifdef CONFIG_PM /* * Allocates an RX filter returned through f * which needs to be freed using rx_filter_free() diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 040f1fdda9f7..a7773a3e02b1 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -55,11 +55,6 @@ config USB_ARCH_HAS_XHCI boolean default PCI -config USB_COMMON - tristate - default y - depends on USB || USB_GADGET - menuconfig USB_SUPPORT bool "USB support" depends on HAS_IOMEM @@ -70,6 +65,11 @@ menuconfig USB_SUPPORT if USB_SUPPORT +config USB_COMMON + tristate + default y + depends on USB || USB_GADGET + # Host-side USB depends on having a host controller # NOTE: dummy_hcd is always an option, but it's ignored here ... # NOTE: SL-811 option should be board-specific ... diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 6c662c509049..075d2eca8108 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -145,7 +145,6 @@ config USB_EHCI_FSL config USB_EHCI_MXC bool "Support for Freescale i.MX on-chip EHCI USB controller" depends on USB_EHCI_HCD && ARCH_MXC - depends on !USB_EHCI_HCD_OMAP select USB_EHCI_ROOT_HUB_TT ---help--- Variation of ARC USB block used in some Freescale chips. diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 3141085de952..b05c6865b610 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1342,7 +1342,7 @@ MODULE_LICENSE ("GPL"); #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \ !defined(XILINX_OF_PLATFORM_DRIVER) -#warning "missing bus glue for ehci-hcd" +#error "missing bus glue for ehci-hcd" #endif static int __init ehci_hcd_init(void) diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 1c19daba81d5..2b1e8d84c873 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -1129,7 +1129,7 @@ MODULE_LICENSE ("GPL"); !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(SM501_OHCI_DRIVER) && \ !defined(TMIO_OHCI_DRIVER) -#warning "missing bus glue for ohci-hcd" +#error "missing bus glue for ohci-hcd" #endif static int __init ohci_hcd_mod_init(void) diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 20d0f83f45ae..6955045199b0 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -382,8 +382,7 @@ struct ssb_device_id { __u16 vendor; __u16 coreid; __u8 revision; - __u8 __pad; -} __attribute__((packed, aligned(2))); +}; #define SSB_DEVICE(_vendor, _coreid, _revision) \ { .vendor = _vendor, .coreid = _coreid, .revision = _revision, } #define SSB_DEVTABLE_END \ @@ -399,7 +398,7 @@ struct bcma_device_id { __u16 id; __u8 rev; __u8 class; -} __attribute__((packed,aligned(2))); +}; #define BCMA_CORE(_manuf, _id, _rev, _class) \ { .manuf = _manuf, .id = _id, .rev = _rev, .class = _class, } #define BCMA_CORETABLE_END \ diff --git a/include/linux/phy.h b/include/linux/phy.h index d8e3d411b2d1..93b3cf77f564 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -548,30 +548,12 @@ int phy_start_interrupts(struct phy_device *phydev); void phy_print_status(struct phy_device *phydev); void phy_device_free(struct phy_device *phydev); -#if IS_ENABLED(CONFIG_PHYLIB) int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask, int (*run)(struct phy_device *)); int phy_register_fixup_for_id(const char *bus_id, int (*run)(struct phy_device *)); int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask, int (*run)(struct phy_device *)); -#else -static inline int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask, - int (*run)(struct phy_device *)) -{ - return 0; -} -static inline int phy_register_fixup_for_id(const char *bus_id, - int (*run)(struct phy_device *)) -{ - return 0; -} -static inline int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask, - int (*run)(struct phy_device *)) -{ - return 0; -} -#endif int phy_scan_fixups(struct phy_device *phydev); int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable); diff --git a/include/linux/usb/ulpi.h b/include/linux/usb/ulpi.h index 687386298eae..6f033a415ecb 100644 --- a/include/linux/usb/ulpi.h +++ b/include/linux/usb/ulpi.h @@ -181,16 +181,8 @@ /*-------------------------------------------------------------------------*/ -#ifdef CONFIG_USB_ULPI struct usb_phy *otg_ulpi_create(struct usb_phy_io_ops *ops, unsigned int flags); -#else -static inline struct usb_phy *otg_ulpi_create(struct usb_phy_io_ops *ops, - unsigned int flags) -{ - return NULL; -} -#endif #ifdef CONFIG_USB_ULPI_VIEWPORT /* access ops for controllers with a viewport register */ diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 40a5462e4cb5..c5de0a84566f 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -7,7 +7,6 @@ menuconfig SND_SOC select SND_PCM select AC97_BUS if SND_SOC_AC97_BUS select SND_JACK if INPUT=y || INPUT=SND - depends on I2C || !I2C select REGMAP_I2C if I2C select REGMAP_SPI if SPI_MASTER ---help--- @@ -27,7 +26,7 @@ config SND_SOC_AC97_BUS bool config SND_SOC_DMAENGINE_PCM - tristate + bool # All the supported SoCs source "sound/soc/atmel/Kconfig" diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c index c437fc32140a..48f9d886f020 100644 --- a/sound/soc/fsl/imx-pcm-dma.c +++ b/sound/soc/fsl/imx-pcm-dma.c @@ -30,7 +30,7 @@ #include <sound/soc.h> #include <sound/dmaengine_pcm.h> -#include <mach-imx/dma.h> +#include <mach/dma.h> #include "imx-pcm.h" diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h index c19f84dc072f..5744e86ca878 100644 --- a/sound/soc/fsl/imx-ssi.h +++ b/sound/soc/fsl/imx-ssi.h @@ -186,7 +186,7 @@ #define DRV_NAME "imx-ssi" #include <linux/dmaengine.h> -#include <mach-imx/dma.h> +#include <mach/dma.h> #include "imx-pcm.h" struct imx_ssi { diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 90237682d301..57a2fa751085 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -112,7 +112,6 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040 config SND_OMAP_SOC_OMAP_HDMI tristate "SoC Audio support for Texas Instruments OMAP HDMI" depends on SND_OMAP_SOC && OMAP4_DSS_HDMI && OMAP2_DSS - depends on BROKEN select SND_OMAP_SOC_HDMI select SND_SOC_OMAP_HDMI_CODEC select OMAP4_DSS_HDMI_AUDIO |