summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-14 20:16:08 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-14 20:16:08 +0100
commitbf7471038840547c9328291b4d9d91c55581dcb8 (patch)
tree356a2ae8279fc3cdc7830f76e75a9d6305690677 /drivers/misc
parentRevert "ARM: sunxi: dt: Convert to the new SID compatibles" (diff)
downloadlinux-bf7471038840547c9328291b4d9d91c55581dcb8.tar.xz
linux-bf7471038840547c9328291b4d9d91c55581dcb8.zip
Revert "misc: eeprom: sunxi: Add new compatibles"
This reverts commit f0de8e04a7201a2000f3c6d09732c11e7f35d42d, it is incorrect, a future patch will fix this up properly. Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/eeprom/sunxi_sid.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
index e137e75a89e5..9c34e5704304 100644
--- a/drivers/misc/eeprom/sunxi_sid.c
+++ b/drivers/misc/eeprom/sunxi_sid.c
@@ -96,11 +96,8 @@ static int sunxi_sid_remove(struct platform_device *pdev)
}
static const struct of_device_id sunxi_sid_of_match[] = {
- { .compatible = "allwinner,sun4i-a10-sid", .data = (void *)16},
- { .compatible = "allwinner,sun7i-a20-sid", .data = (void *)512},
-
- /* Deprecated */
{ .compatible = "allwinner,sun4i-sid", .data = (void *)16},
+ { .compatible = "allwinner,sun7i-a20-sid", .data = (void *)512},
{/* sentinel */},
};
MODULE_DEVICE_TABLE(of, sunxi_sid_of_match);