Merge commit 'v2.6.28-rc2' into topic/asoc

[karo-tx-linux.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 987f5912720a2d6ffd6d32a33a062e3b4ef27892..1a3686d15f98f4877dcaad25b393201f6c95640b 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -450,7 +450,7 @@ static inline void set_dev_node(struct device *dev, int node)
 }
 #endif
 
-static inline void *dev_get_drvdata(struct device *dev)
+static inline void *dev_get_drvdata(const struct device *dev)
 {
        return dev->driver_data;
 }