projects
/
cascardo
/
linux.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/davej/agpgart
[cascardo/linux.git]
/
include
/
asm-powerpc
/
ps3.h
diff --git
a/include/asm-powerpc/ps3.h
b/include/asm-powerpc/ps3.h
index
e5982ad
..
821581a
100644
(file)
--- a/
include/asm-powerpc/ps3.h
+++ b/
include/asm-powerpc/ps3.h
@@
-355,13
+355,7
@@
extern struct bus_type ps3_system_bus_type;
/* vuart routines */
/* vuart routines */
-struct ps3_vuart_stats {
- unsigned long bytes_written;
- unsigned long bytes_read;
- unsigned long tx_interrupts;
- unsigned long rx_interrupts;
- unsigned long disconnect_interrupts;
-};
+struct ps3_vuart_port_priv;
/**
* struct ps3_vuart_port_device - a device on a vuart port
/**
* struct ps3_vuart_port_device - a device on a vuart port
@@
-370,24
+364,17
@@
struct ps3_vuart_stats {
struct ps3_vuart_port_device {
enum ps3_match_id match_id;
struct device core;
struct ps3_vuart_port_device {
enum ps3_match_id match_id;
struct device core;
+ struct ps3_vuart_port_priv* priv; /* private driver variables */
- /* private driver variables */
- unsigned int port_number;
- u64 interrupt_mask;
- struct {
- spinlock_t lock;
- struct list_head head;
- } tx_list;
- struct {
- unsigned long bytes_held;
- spinlock_t lock;
- struct list_head head;
- } rx_list;
- struct ps3_vuart_stats stats;
};
int ps3_vuart_port_device_register(struct ps3_vuart_port_device *dev);
};
int ps3_vuart_port_device_register(struct ps3_vuart_port_device *dev);
+/* system manager */
+
+void ps3_sys_manager_restart(void);
+void ps3_sys_manager_power_off(void);
+
struct ps3_prealloc {
const char *name;
void *address;
struct ps3_prealloc {
const char *name;
void *address;