--- zzzz-none-000/linux-2.6.39.4/drivers/base/core.c	2011-08-03 19:43:28.000000000 +0000
+++ puma6-arm-6490-729/linux-2.6.39.4/drivers/base/core.c	2021-11-10 13:23:10.000000000 +0000
@@ -9,6 +9,12 @@
  * This file is released under the GPLv2
  *
  */
+/******************************************************************
+
+ Includes Intel Corporation's changes/modifications dated: 07/2011.
+ Changed/modified portions - Copyright(c) 2011, Intel Corporation.
+
+******************************************************************/
 
 #include <linux/device.h>
 #include <linux/err.h>
@@ -1155,8 +1161,11 @@
 	device_del(dev);
 	put_device(dev);
 }
-
+#ifdef CONFIG_ARCH_GEN3
+struct device *next_device(struct klist_iter *i)
+#else
 static struct device *next_device(struct klist_iter *i)
+#endif
 {
 	struct klist_node *n = klist_next(i);
 	struct device *dev = NULL;
@@ -1517,9 +1526,9 @@
 }
 EXPORT_SYMBOL_GPL(device_create);
 
-static int __match_devt(struct device *dev, void *data)
+static int __match_devt(struct device *dev, const void *data)
 {
-	dev_t *devt = data;
+	const dev_t *devt = data;
 
 	return dev->devt == *devt;
 }