cfg80211: fix can_beacon_sec_chan, reenable HT40

[net-next-2.6.git] / block / blk.h

diff --git a/block/blk.h b/block/blk.h
index faf94f2acb12d0b6d72f8ba6e172c4fbc48ad831..1e675e5ade02615ee5eba4293a6f6b07cbf3c9c1 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -116,10 +116,6 @@ void blk_queue_congestion_threshold(struct request_queue *q);
 
 int blk_dev_init(void);
 
-void elv_quiesce_start(struct request_queue *q);
-void elv_quiesce_end(struct request_queue *q);
-
-
 /*
  * Return the threshold (number of used requests) at which the queue is
  * considered to be congested.  It include a little hysteresis to keep the
@@ -138,14 +134,6 @@ static inline int queue_congestion_off_threshold(struct request_queue *q)
        return q->nr_congestion_off;
 }
 
-#if defined(CONFIG_BLK_DEV_INTEGRITY)
-
-#define rq_for_each_integrity_segment(bvl, _rq, _iter)         \
-       __rq_for_each_bio(_iter.bio, _rq)                       \
-               bip_for_each_vec(bvl, _iter.bio->bi_integrity, _iter.i)
-
-#endif /* BLK_DEV_INTEGRITY */
-
 static inline int blk_cpu_to_group(int cpu)
 {
        int group = NR_CPUS;