Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[~andy/linux] / include / linux / hw_random.h

diff --git a/include/linux/hw_random.h b/include/linux/hw_random.h
index 21ea7610e1775ae4be3015f36f956d19f88e8b73..85d11916e9ea48a878f54eb3aff5045a8ec2b2c7 100644 (file)
--- a/include/linux/hw_random.h
+++ b/include/linux/hw_random.h
@@ -33,7 +33,7 @@ struct hwrng {
        const char *name;
        int (*init)(struct hwrng *rng);
        void (*cleanup)(struct hwrng *rng);
-       int (*data_present)(struct hwrng *rng);
+       int (*data_present)(struct hwrng *rng, int wait);
        int (*data_read)(struct hwrng *rng, u32 *data);
        unsigned long priv;