linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / char / agp / agp.h

diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index 8b3317f..b4af87c 100644 (file)
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -19,9 +19,9 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * JEFF HARTMANN, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+ * JEFF HARTMANN, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
@@ -53,7 +53,7 @@ enum aper_size_type {
 struct gatt_mask {
        unsigned long mask;
        u32 type;
-       /* totally device specific, for integrated chipsets that
+       /* totally device specific, for integrated chipsets that 
         * might have different types of memory masks.  For other
         * devices this will probably be ignored */
 };
@@ -104,7 +104,8 @@ struct agp_bridge_driver {
        void (*agp_enable)(struct agp_bridge_data *, u32);
        void (*cleanup)(void);
        void (*tlb_flush)(struct agp_memory *);
-       unsigned long (*mask_memory)(struct agp_bridge_data *, unsigned long, int);
+       unsigned long (*mask_memory)(struct agp_bridge_data *,
+               unsigned long, int);
        void (*cache_flush)(void);
        int (*create_gatt_table)(struct agp_bridge_data *);
        int (*free_gatt_table)(struct agp_bridge_data *);
@@ -117,7 +118,7 @@ struct agp_bridge_driver {
 };
 
 struct agp_bridge_data {
-       const struct agp_version *version;
+       struct agp_version *version;
        struct agp_bridge_driver *driver;
        struct vm_operations_struct *vm_ops;
        void *previous_size;