diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /drivers/s390/char/tape.h | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/s390/char/tape.h')
| -rw-r--r-- | drivers/s390/char/tape.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h index c07809c8016a..5469e099597e 100644 --- a/drivers/s390/char/tape.h +++ b/drivers/s390/char/tape.h | |||
| @@ -285,7 +285,7 @@ extern int tape_mtop(struct tape_device *, int, int); | |||
| 285 | extern void tape_state_set(struct tape_device *, enum tape_state); | 285 | extern void tape_state_set(struct tape_device *, enum tape_state); |
| 286 | 286 | ||
| 287 | extern int tape_generic_online(struct tape_device *, struct tape_discipline *); | 287 | extern int tape_generic_online(struct tape_device *, struct tape_discipline *); |
| 288 | extern int tape_generic_offline(struct tape_device *device); | 288 | extern int tape_generic_offline(struct ccw_device *); |
| 289 | 289 | ||
| 290 | /* Externals from tape_devmap.c */ | 290 | /* Externals from tape_devmap.c */ |
| 291 | extern int tape_generic_probe(struct ccw_device *); | 291 | extern int tape_generic_probe(struct ccw_device *); |