backport: add hacks for const correctness

8d51a3cc · Juan David González Cobas · 01ce0bb2 · 8d51a3cc · 8d51a3cc
Commit 8d51a3cc authored May 27, 2013 by Juan David González Cobas
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

fmc-sdb.c kernel/fmc-sdb.c +1 -1

for-2.6.24.h kernel/for-2.6.24.h +1 -1

No files found.
--- a/kernel/fmc-sdb.c
+++ b/kernel/fmc-sdb.c
@@ -166,7 +166,7 @@ static void __fmc_show_sdb_tree(const struct fmc_device *fmc,
 		base = 0;
 		for (ap = arr; ap; ap = ap->parent)
 			base += ap->baseaddr;
-		dev_info(&fmc->dev, "SDB: ");
+		dev_info((struct device *)&fmc->dev, "SDB: ");

 		for (j = 0; j < level; j++)
 			printk("   ");

--- a/kernel/for-2.6.24.h
+++ b/kernel/for-2.6.24.h
@@ -12,7 +12,7 @@ static inline struct delayed_work *to_delayed_work(struct work_struct *work)
 /* dev_name() appeared in v2.6.26-rc1 */
 /* dev_set_name() appeared in v2.6.26-rc6 */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
-static inline const char *dev_name(struct device *dev)
+static inline const char *dev_name(const struct device *dev)
 {
        return kobject_name(&dev->kobj);
 }