summaryrefslogtreecommitdiff
path: root/arch/arm/mach-bcm2708
diff options
context:
space:
mode:
authorPhil Elwell <pelwell@users.noreply.github.com>2015-05-19 09:17:19 +0100
committerPhil Elwell <pelwell@users.noreply.github.com>2015-05-19 09:17:19 +0100
commit9112b62cec10ca617232b817ca37f0858323ca7c (patch)
treeb8780872b14b0b906803cac3bfd1bfbb67fbe428 /arch/arm/mach-bcm2708
parent3048b2ee0cb7710595443e2bf748235d43fdb47b (diff)
parent182827458d3ac2b530c0c41414793a3379a3243a (diff)
downloadlinux-9112b62cec10ca617232b817ca37f0858323ca7c.tar.gz
Merge pull request #970 from notro/fb
bcm2708_fb: Add ARCH_BCM2835 support
Diffstat (limited to 'arch/arm/mach-bcm2708')
-rw-r--r--arch/arm/mach-bcm2708/bcm2708.c2
-rw-r--r--arch/arm/mach-bcm2708/include/mach/dma.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
index 7cc47c1fdb71..cde2124566fe 100644
--- a/arch/arm/mach-bcm2708/bcm2708.c
+++ b/arch/arm/mach-bcm2708/bcm2708.c
@@ -928,7 +928,7 @@ void __init bcm2708_init(void)
bcm_register_device_dt(&w1_device);
#endif
bcm_register_device(&bcm2708_systemtimer_device);
- bcm_register_device(&bcm2708_fb_device);
+ bcm_register_device_dt(&bcm2708_fb_device);
bcm_register_device(&bcm2708_usb_device);
bcm_register_device(&bcm2708_uart1_device);
bcm_register_device(&bcm2708_powerman_device);
diff --git a/arch/arm/mach-bcm2708/include/mach/dma.h b/arch/arm/mach-bcm2708/include/mach/dma.h
deleted file mode 100644
index d826705e1574..000000000000
--- a/arch/arm/mach-bcm2708/include/mach/dma.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* This file can be removed when all the drivers have been updated */
-#include <linux/platform_data/dma-bcm2708.h>