Merge commit 'v2.6.32-rc5' into perf/probes

[karo-tx-linux.git] / drivers / char / agp / agp.h

diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index d6f36c004d9b7edeeea488f77ed9984639de607b..870f12cfed93000e670423e9aac8afad892503cf 100644 (file)
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -131,7 +131,7 @@ struct agp_bridge_driver {
 struct agp_bridge_data {
        const struct agp_version *version;
        const struct agp_bridge_driver *driver;
-       struct vm_operations_struct *vm_ops;
+       const struct vm_operations_struct *vm_ops;
        void *previous_size;
        void *current_size;
        void *dev_private_data;