summaryrefslogtreecommitdiff
path: root/arch/arm/mach-bcm2708
diff options
context:
space:
mode:
authorNoralf Trønnes <noralf@tronnes.org>2015-05-02 09:34:26 +0200
committerpopcornmix <popcornmix@gmail.com>2015-05-18 14:13:11 +0100
commit6ca78da96b81439f7ca50e05df10410669ebbb10 (patch)
treedd51717437b017c32cda0dd91c1d5b37bdff8949 /arch/arm/mach-bcm2708
parent8707f869b973a648f7cd8c92693f18e2c643e5b8 (diff)
downloadlinux-6ca78da96b81439f7ca50e05df10410669ebbb10.tar.gz
BCM270x: Use bcm2708-vcio
Use bcm2708-vcio instead of the arch version. Change affected drivers to use linux/platform_data/mailbox-bcm2708.h Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Diffstat (limited to 'arch/arm/mach-bcm2708')
-rw-r--r--arch/arm/mach-bcm2708/Makefile2
-rw-r--r--arch/arm/mach-bcm2708/power.c2
-rw-r--r--arch/arm/mach-bcm2708/vc_mem.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-bcm2708/Makefile b/arch/arm/mach-bcm2708/Makefile
index 454408cbeade..c1e7d41d8f4c 100644
--- a/arch/arm/mach-bcm2708/Makefile
+++ b/arch/arm/mach-bcm2708/Makefile
@@ -2,6 +2,6 @@
# Makefile for the linux kernel.
#
-obj-$(CONFIG_MACH_BCM2708) += bcm2708.o armctrl.o vcio.o power.o
+obj-$(CONFIG_MACH_BCM2708) += bcm2708.o armctrl.o power.o
obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o
obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o
diff --git a/arch/arm/mach-bcm2708/power.c b/arch/arm/mach-bcm2708/power.c
index 0db355dcc233..796837f2702c 100644
--- a/arch/arm/mach-bcm2708/power.c
+++ b/arch/arm/mach-bcm2708/power.c
@@ -14,8 +14,8 @@
#include <linux/module.h>
#include <linux/semaphore.h>
#include <linux/bug.h>
+#include <linux/platform_data/mailbox-bcm2708.h>
#include <mach/power.h>
-#include <mach/vcio.h>
#include <mach/arm_power.h>
#define DRIVER_NAME "bcm2708_power"
diff --git a/arch/arm/mach-bcm2708/vc_mem.c b/arch/arm/mach-bcm2708/vc_mem.c
index 2982af7182ba..226b737d102f 100644
--- a/arch/arm/mach-bcm2708/vc_mem.c
+++ b/arch/arm/mach-bcm2708/vc_mem.c
@@ -22,6 +22,7 @@
#include <linux/debugfs.h>
#include <asm/uaccess.h>
#include <linux/dma-mapping.h>
+#include <linux/platform_data/mailbox-bcm2708.h>
#ifdef CONFIG_ARCH_KONA
#include <chal/chal_ipc.h>
@@ -31,7 +32,6 @@
#endif
#include "mach/vc_mem.h"
-#include <mach/vcio.h>
#define DRIVER_NAME "vc-mem"