diff options
| author | Noralf Trønnes <noralf@tronnes.org> | 2015-05-02 09:34:26 +0200 |
|---|---|---|
| committer | popcornmix <popcornmix@gmail.com> | 2015-05-18 14:13:11 +0100 |
| commit | 6ca78da96b81439f7ca50e05df10410669ebbb10 (patch) | |
| tree | dd51717437b017c32cda0dd91c1d5b37bdff8949 /drivers | |
| parent | 8707f869b973a648f7cd8c92693f18e2c643e5b8 (diff) | |
| download | linux-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 'drivers')
| -rw-r--r--[-rwxr-xr-x] | drivers/cpufreq/bcm2835-cpufreq.c | 2 | ||||
| -rw-r--r-- | drivers/hwmon/bcm2835-hwmon.c | 2 | ||||
| -rw-r--r-- | drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 2 | ||||
| -rw-r--r-- | drivers/thermal/bcm2835-thermal.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/bcm2708_fb.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/cpufreq/bcm2835-cpufreq.c b/drivers/cpufreq/bcm2835-cpufreq.c index 447ca0902704..6735da9d31e3 100755..100644 --- a/drivers/cpufreq/bcm2835-cpufreq.c +++ b/drivers/cpufreq/bcm2835-cpufreq.c @@ -26,7 +26,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/cpufreq.h> -#include <mach/vcio.h> +#include <linux/platform_data/mailbox-bcm2708.h> /* ---------- DEFINES ---------- */ /*#define CPUFREQ_DEBUG_ENABLE*/ /* enable debugging */ diff --git a/drivers/hwmon/bcm2835-hwmon.c b/drivers/hwmon/bcm2835-hwmon.c index 5bbed450100a..d14502ca8a5a 100644 --- a/drivers/hwmon/bcm2835-hwmon.c +++ b/drivers/hwmon/bcm2835-hwmon.c @@ -17,9 +17,9 @@ #include <linux/init.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> +#include <linux/platform_data/mailbox-bcm2708.h> #include <linux/platform_device.h> #include <linux/sysfs.h> -#include <mach/vcio.h> #include <linux/slab.h> #include <linux/err.h> diff --git a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c index 8ec88bb15eba..70e5086292e7 100644 --- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -40,13 +40,13 @@ #include <linux/dma-mapping.h> #include <linux/version.h> #include <linux/io.h> +#include <linux/platform_data/mailbox-bcm2708.h> #include <linux/uaccess.h> #include <asm/pgtable.h> #include <mach/irqs.h> #include <mach/platform.h> -#include <mach/vcio.h> #define TOTAL_SLOTS (VCHIQ_SLOT_ZERO_SLOTS + 2 * 32) diff --git a/drivers/thermal/bcm2835-thermal.c b/drivers/thermal/bcm2835-thermal.c index 85fceb5feab2..0c556d10c853 100644 --- a/drivers/thermal/bcm2835-thermal.c +++ b/drivers/thermal/bcm2835-thermal.c @@ -15,10 +15,10 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/platform_data/mailbox-bcm2708.h> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/sysfs.h> -#include <mach/vcio.h> #include <linux/thermal.h> diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c index 52e655acf25d..345c15e2b16b 100644 --- a/drivers/video/fbdev/bcm2708_fb.c +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -24,6 +24,7 @@ #include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/list.h> +#include <linux/platform_data/mailbox-bcm2708.h> #include <linux/platform_device.h> #include <linux/clk.h> #include <linux/printk.h> @@ -32,7 +33,6 @@ #include <mach/dma.h> #include <mach/platform.h> -#include <mach/vcio.h> #include <asm/sizes.h> #include <linux/io.h> |