summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/vexpress/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boards/vexpress/init.c')
-rw-r--r--arch/arm/boards/vexpress/init.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/boards/vexpress/init.c b/arch/arm/boards/vexpress/init.c
index 6ba23bbb62..f2a1307e45 100644
--- a/arch/arm/boards/vexpress/init.c
+++ b/arch/arm/boards/vexpress/init.c
@@ -8,8 +8,8 @@
#include <init.h>
#include <asm/armlinux.h>
#include <asm/system_info.h>
-#include <generated/mach-types.h>
-#include <mach/devices.h>
+#include <asm/mach-types.h>
+#include <mach/vexpress/devices.h>
#include <environment.h>
#include <linux/sizes.h>
#include <io.h>
@@ -42,7 +42,7 @@ static int of_fixup_virtio_mmio(struct device_node *root, void *unused)
return 0;
}
-static int vexpress_probe(struct device_d *dev)
+static int vexpress_probe(struct device *dev)
{
char *hostname = "vexpress-unknown";
int ret = 0;
@@ -77,8 +77,9 @@ static const struct of_device_id vexpress_of_match[] = {
{ .compatible = "arm,vexpress" },
{ /* Sentinel */},
};
+MODULE_DEVICE_TABLE(of, vexpress_of_match);
-static struct driver_d vexpress_board_driver = {
+static struct driver vexpress_board_driver = {
.name = "board-vexpress",
.probe = vexpress_probe,
.of_compatible = vexpress_of_match,