From 217f6070ddf6464f4ca62e1e19ac746454946403 Mon Sep 17 00:00:00 2001
From: Santosh Nayak <santoshprasadnayak@gmail.com>
Date: Thu, 5 Apr 2012 11:31:08 +0530
Subject: [PATCH] --- yaml --- r: 307059 b: refs/heads/master c:
 971ca4717830c03a50e1ad9993c85601a0496de7 h: refs/heads/master i:   307057:
 dde17fc98345fb8abffe1d2fbfd2e35258baede5   307055:
 8e99811fc4a7e93805b0d87e2abac843c3636940 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/char/agp/generic.c | 2 --
 trunk/drivers/char/agp/sgi-agp.c | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1b662691b65b..a53424762866 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: effbc4fd8e37e41d6f2bb6bcc611c14b4fbdcf9b
+refs/heads/master: 971ca4717830c03a50e1ad9993c85601a0496de7
diff --git a/trunk/drivers/char/agp/generic.c b/trunk/drivers/char/agp/generic.c
index 17e05d1076b3..38022ea7eeb4 100644
--- a/trunk/drivers/char/agp/generic.c
+++ b/trunk/drivers/char/agp/generic.c
@@ -1010,7 +1010,6 @@ int agp_generic_free_gatt_table(struct agp_bridge_data *bridge)
 	case LVL2_APER_SIZE:
 		/* The generic routines can't deal with 2 level gatt's */
 		return -EINVAL;
-		break;
 	default:
 		page_order = 0;
 		break;
@@ -1077,7 +1076,6 @@ int agp_generic_insert_memory(struct agp_memory * mem, off_t pg_start, int type)
 	case LVL2_APER_SIZE:
 		/* The generic routines can't deal with 2 level gatt's */
 		return -EINVAL;
-		break;
 	default:
 		num_entries = 0;
 		break;
diff --git a/trunk/drivers/char/agp/sgi-agp.c b/trunk/drivers/char/agp/sgi-agp.c
index ffa888cd1c88..192000377737 100644
--- a/trunk/drivers/char/agp/sgi-agp.c
+++ b/trunk/drivers/char/agp/sgi-agp.c
@@ -158,7 +158,6 @@ static int sgi_tioca_insert_memory(struct agp_memory *mem, off_t pg_start,
 		break;
 	case LVL2_APER_SIZE:
 		return -EINVAL;
-		break;
 	default:
 		num_entries = 0;
 		break;