summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-05-06 21:36:13 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-05-06 21:36:13 +0200
commit3975737a7d48b3c767f60be994d55884321d45f9 (patch)
tree8be2f56c4978420e6e4c4b3292e18c61b07a926e /drivers/base
parent10fb7853084356ef3c6b40ddf21dfb05dbd15691 (diff)
parent6d4afd96fc94a3f2d256ef4e8d7c9687a145a701 (diff)
downloadbarebox-3975737a7d48b3c767f60be994d55884321d45f9.tar.gz
barebox-3975737a7d48b3c767f60be994d55884321d45f9.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/bus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index c41e0b0438..1264e40250 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -58,7 +58,7 @@ int device_match(struct device_d *dev, struct driver_d *drv)
return 0;
if (drv->id_table) {
- struct platform_device_id *id = drv->id_table;
+ const struct platform_device_id *id = drv->id_table;
while (id->name) {
if (!strcmp(id->name, dev->name)) {
@@ -74,7 +74,7 @@ int device_match(struct device_d *dev, struct driver_d *drv)
int device_match_of_modalias(struct device_d *dev, struct driver_d *drv)
{
- struct platform_device_id *id = drv->id_table;
+ const struct platform_device_id *id = drv->id_table;
const char *of_modalias = NULL, *p;
int cplen;
const char *compat;