diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-22 17:28:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-22 17:28:36 -0800 |
| commit | 37b5d10afebe0d7c405543e925e7a010ddceb1f8 (patch) | |
| tree | 584c1f8e5c2028ff40ca73cc2c09ddf8e5d2080a /include/linux | |
| parent | 7a272c66115f213c86f101716ecfdc8acb8d7470 (diff) | |
| parent | d1ca66cc9b8e58229bc89e92421a3d08d890807b (diff) | |
Merge bk://bk.phunnypharm.org/linux-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/apm_bios.h | 1 | ||||
| -rw-r--r-- | include/linux/blkdev.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h index b3b981af768d..290aef326812 100644 --- a/include/linux/apm_bios.h +++ b/include/linux/apm_bios.h @@ -53,6 +53,7 @@ struct apm_info { int get_power_status_broken; int get_power_status_swabinminutes; int allow_ints; + int forbid_idle; int realmode_power_off; int disabled; }; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 80b4c47842b8..d0ba766eca75 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -485,7 +485,7 @@ static inline void blk_queue_bounce(request_queue_t *q, struct bio **bio) #define rq_for_each_bio(_bio, rq) \ if ((rq->bio)) \ - for (_bio = (rq)->bio; _bio; _bio = bio->bi_next) + for (_bio = (rq)->bio; _bio; _bio = _bio->bi_next) struct sec_size { unsigned block_size; |