Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'x86/vt-d', 'x86/amd', ...

[sfrench/cifs-2.6.git] / sound / atmel / ac97c.c

diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index cf4cedf2b420f12de4d46cf702fabeab2c136b02..6dad042630d8c4ab22f2e9c2f4a98823d1c5092f 100644 (file)
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -916,7 +916,6 @@ static struct ac97c_platform_data *atmel_ac97c_probe_dt(struct device *dev)
 {
        struct ac97c_platform_data *pdata;
        struct device_node *node = dev->of_node;
 {
        struct ac97c_platform_data *pdata;
        struct device_node *node = dev->of_node;

-       const struct of_device_id *match;

 
        if (!node) {
                dev_err(dev, "Device does not have associated DT data\n");
 
        if (!node) {
                dev_err(dev, "Device does not have associated DT data\n");