diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-29 13:49:01 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-08-01 03:42:42 -0400 |
commit | 22ae782f86b726f9cea752c0f269ff6dcdf2f6e1 (patch) | |
tree | 9458a01b24d65fa2eab27ad5bdb2fa399b3c389f /drivers/video/controlfb.c | |
parent | 12b15e83289bc7cf2ec9a342412e0c955beeb395 (diff) |
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/controlfb.c')
-rw-r--r-- | drivers/video/controlfb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c index 49fcbe8f18ac..c225dcce89e7 100644 --- a/drivers/video/controlfb.c +++ b/drivers/video/controlfb.c | |||
@@ -40,6 +40,8 @@ | |||
40 | #include <linux/vmalloc.h> | 40 | #include <linux/vmalloc.h> |
41 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
42 | #include <linux/interrupt.h> | 42 | #include <linux/interrupt.h> |
43 | #include <linux/of.h> | ||
44 | #include <linux/of_address.h> | ||
43 | #include <linux/fb.h> | 45 | #include <linux/fb.h> |
44 | #include <linux/init.h> | 46 | #include <linux/init.h> |
45 | #include <linux/pci.h> | 47 | #include <linux/pci.h> |