diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-19 21:51:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-19 21:51:41 -0400 |
| commit | bfd189a8e944dd0b8135dea2c23ac399bbe34535 (patch) | |
| tree | 89f2963ec3e2df7b9b980587ec2d2a334c7e2172 /drivers/char/agp/intel-agp.c | |
| parent | bbf70132db2767f66b411fa90488aacac72e06dd (diff) | |
| parent | 81c246691535ee3f865fbe6804b3be1b2c159e95 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] alpha-agp warning fix
[AGPGART] uninorth-agp warning fixes
[AGPGART] Remove pointless initialisation in intel-agp
[AGPGART] Remove pointless code from agp_generic_create_gatt_table()
Diffstat (limited to 'drivers/char/agp/intel-agp.c')
| -rw-r--r-- | drivers/char/agp/intel-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index bddcae54b16d..61ac3809f997 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c | |||
| @@ -736,7 +736,7 @@ static int intel_i915_remove_entries(struct agp_memory *mem,off_t pg_start, | |||
| 736 | static int intel_i915_fetch_size(void) | 736 | static int intel_i915_fetch_size(void) |
| 737 | { | 737 | { |
| 738 | struct aper_size_info_fixed *values; | 738 | struct aper_size_info_fixed *values; |
| 739 | u32 temp, offset = 0; | 739 | u32 temp, offset; |
| 740 | 740 | ||
| 741 | #define I915_256MB_ADDRESS_MASK (1<<27) | 741 | #define I915_256MB_ADDRESS_MASK (1<<27) |
| 742 | 742 | ||