git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
include
/
asm-powerpc
/
ps3.h
diff --git
a/include/asm-powerpc/ps3.h
b/include/asm-powerpc/ps3.h
index
4f5a1e0
..
e5982ad
100644
(file)
--- a/
include/asm-powerpc/ps3.h
+++ b/
include/asm-powerpc/ps3.h
@@
-388,4
+388,13
@@
struct ps3_vuart_port_device {
int ps3_vuart_port_device_register(struct ps3_vuart_port_device *dev);
+struct ps3_prealloc {
+ const char *name;
+ void *address;
+ unsigned long size;
+ unsigned long align;
+};
+
+extern struct ps3_prealloc ps3fb_videomemory;
+
#endif