Merge head 'drm-via' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[linux-2.6] / include / linux / loop.h

diff --git a/include/linux/loop.h b/include/linux/loop.h
index 8220d9c9da0073e2f2b35bd4fe4ce0b2c29e4332..53fa51595443e81d2878ab22902f0815d1933844 100644 (file)
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -61,7 +61,7 @@ struct loop_device {
        struct semaphore        lo_sem;
        struct semaphore        lo_ctl_mutex;
        struct semaphore        lo_bh_mutex;
-       atomic_t                lo_pending;
+       int                     lo_pending;
 
        request_queue_t         *lo_queue;
 };