summaryrefslogtreecommitdiffstats
path: root/drivers/video/offb.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-07-29 11:49:01 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-08-01 01:42:42 -0600
commit22ae782f86b726f9cea752c0f269ff6dcdf2f6e1 (patch)
tree9458a01b24d65fa2eab27ad5bdb2fa399b3c389f /drivers/video/offb.c
parent12b15e83289bc7cf2ec9a342412e0c955beeb395 (diff)
downloadop-kernel-dev-22ae782f86b726f9cea752c0f269ff6dcdf2f6e1.zip
op-kernel-dev-22ae782f86b726f9cea752c0f269ff6dcdf2f6e1.tar.gz
of/address: Clean up function declarations
This patch moves the declaration of of_get_address(), of_get_pci_address(), and of_pci_address_to_resource() out of arch code and into the common linux/of_address header file. This patch also fixes some of the asm/prom.h ordering issues. It still includes some header files that it ideally shouldn't be, but at least the ordering is consistent now so that of_* overrides work. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/video/offb.c')
-rw-r--r--drivers/video/offb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 46dda7d..cb163a53 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -19,13 +19,14 @@
#include <linux/mm.h>
#include <linux/vmalloc.h>
#include <linux/delay.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
#include <linux/interrupt.h>
#include <linux/fb.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/pci.h>
#include <asm/io.h>
-#include <asm/prom.h>
#ifdef CONFIG_PPC64
#include <asm/pci-bridge.h>
OpenPOWER on IntegriCloud