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()

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 4e1891e2c035..a92ab53a1370 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;