diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-19 18:51:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-19 18:51:41 -0700 |
| commit | bfd189a8e944dd0b8135dea2c23ac399bbe34535 (patch) | |
| tree | 89f2963ec3e2df7b9b980587ec2d2a334c7e2172 /drivers/char/agp/generic.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/generic.c')
| -rw-r--r-- | drivers/char/agp/generic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index 4e1891e2c03..a92ab53a137 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c @@ -809,12 +809,10 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge) case U32_APER_SIZE: bridge->current_size = A_IDX32(bridge); break; - /* This case will never really happen. */ + /* These cases will never really happen. */ case FIXED_APER_SIZE: case LVL2_APER_SIZE: default: - bridge->current_size = - bridge->current_size; break; } temp = bridge->current_size; |