Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block

[pandora-kernel.git] / include / linux / virtio_config.h

diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index 99f5145..0093dd7 100644 (file)
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -79,8 +79,7 @@
  *     the dev->feature bits if it wants.
  */
 typedef void vq_callback_t(struct virtqueue *);
-struct virtio_config_ops
-{
+struct virtio_config_ops {
        void (*get)(struct virtio_device *vdev, unsigned offset,
                    void *buf, unsigned len);
        void (*set)(struct virtio_device *vdev, unsigned offset,
@@ -110,8 +109,7 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev,
                                      unsigned int fbit)
 {
        /* Did you forget to fix assumptions on max features? */
-       if (__builtin_constant_p(fbit))
-               BUILD_BUG_ON(fbit >= 32);
+       MAYBE_BUILD_BUG_ON(fbit >= 32);
 
        if (fbit < VIRTIO_TRANSPORT_F_START)
                virtio_check_driver_offered_feature(vdev, fbit);