git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-arm
/
hardware
/
sa1111.h
diff --git
a/include/asm-arm/hardware/sa1111.h
b/include/asm-arm/hardware/sa1111.h
index
8fd4f52
..
6aa0a5b
100644
(file)
--- a/
include/asm-arm/hardware/sa1111.h
+++ b/
include/asm-arm/hardware/sa1111.h
@@
-1,5
+1,5
@@
/*
/*
- * linux/include/asm-arm/hardware/
SA-
1111.h
+ * linux/include/asm-arm/hardware/
sa
1111.h
*
* Copyright (C) 2000 John G Dorsey <john+@cs.cmu.edu>
*
*
* Copyright (C) 2000 John G Dorsey <john+@cs.cmu.edu>
*
@@
-567,7
+567,7
@@
struct sa1111_driver {
unsigned int devid;
int (*probe)(struct sa1111_dev *);
int (*remove)(struct sa1111_dev *);
unsigned int devid;
int (*probe)(struct sa1111_dev *);
int (*remove)(struct sa1111_dev *);
- int (*suspend)(struct sa1111_dev *,
u32
);
+ int (*suspend)(struct sa1111_dev *,
pm_message_t
);
int (*resume)(struct sa1111_dev *);
};
int (*resume)(struct sa1111_dev *);
};