diff --git a/src/devices/device.c b/src/devices/device.c
index 434222cc3c..3f3cc57f10 100644
--- a/src/devices/device.c
+++ b/src/devices/device.c
@@ -42,7 +42,7 @@
 /** Linked list of ALL devices */
 struct device *all_devices = &dev_root;
 /** Pointer to the last device */
-extern struct device **last_dev_p;
+extern struct device *last_dev;
 /** Linked list of free resources */
 struct resource *free_resources = NULL;
 
@@ -95,8 +95,8 @@ device_t alloc_dev(struct bus *parent, struct device_path *path)
 	/* Append a new device to the global device list.
 	 * The list is used to find devices once everything is set up.
 	 */
-	*last_dev_p = dev;
-	last_dev_p = &dev->next;
+	last_dev->next = dev;
+	last_dev = dev;
 
 	spin_unlock(&dev_lock);
 	return dev;
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 4abfd2c3bb..a3994fbdcd 100755
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -446,7 +446,7 @@ int main(int argc, char** argv) {
 	}
 	fprintf(staticc, "\n/* pass 0 */\n");
 	walk_device_tree(staticc, &root, pass0, NULL);
-	fprintf(staticc, "\n/* pass 1 */\nstruct mainboard_config mainboard_info_0;\nstruct device **last_dev_p = &%s.next;\n", lastdev->name);
+	fprintf(staticc, "\n/* pass 1 */\nstruct mainboard_config mainboard_info_0;\nstruct device *last_dev = &%s;\n", lastdev->name);
 	walk_device_tree(staticc, &root, pass1, NULL);
 
 	fclose(staticc);