packages: kernel/kernel-small_fixes.patch - amd-k7-agp.c hunk obsolete

[arekm]

Author: arekm                        Date: Wed Jan  5 20:11:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- amd-k7-agp.c hunk obsolete

---- Files affected:
packages/kernel:
   kernel-small_fixes.patch (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.14 packages/kernel/kernel-small_fixes.patch:1.15
--- packages/kernel/kernel-small_fixes.patch:1.14	Sun Dec 12 14:21:34 2010
+++ packages/kernel/kernel-small_fixes.patch	Wed Jan  5 21:11:41 2011
@@ -116,27 +116,4 @@
  	/* block receiver */
  	sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
  }
-diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
-index b6b1568..b1b4362 100644
---- a/drivers/char/agp/amd-k7-agp.c
-+++ b/drivers/char/agp/amd-k7-agp.c
-@@ -309,7 +309,8 @@ static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
- 
- 	num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries;
- 
--	if (type != 0 || mem->type != 0)
-+	if (type != mem->type ||
-+	    agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type))
- 		return -EINVAL;
- 
- 	if ((pg_start + mem->page_count) > num_entries)
-@@ -348,7 +349,8 @@ static int amd_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
- 	unsigned long __iomem *cur_gatt;
- 	unsigned long addr;
- 
--	if (type != 0 || mem->type != 0)
-+	if (type != mem->type ||
-+	    agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type))
- 		return -EINVAL;
- 
- 	for (i = pg_start; i < (mem->page_count + pg_start); i++) {
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.14&r2=1.15&f=u