Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6

* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp: convert drivers/char/agp/frontend.c to use unlocked_ioctl
  agp: fix shadowed variable warning in amd-k7-agp.c

2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index d28669992147..96bdb9296b07 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -436,8 +436,9 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev,
            system controller may experience noise due to strong drive strengths
          */
         if (agp_bridge->dev->device == PCI_DEVICE_ID_AMD_FE_GATE_7006) {
-                u8 cap_ptr=0;
                 struct pci_dev *gfxcard=NULL;
+
+                cap_ptr = 0;
                 while (!cap_ptr) {
                         gfxcard = pci_get_class(PCI_CLASS_DISPLAY_VGA<<8, gfxcard);
                         if (!gfxcard) {
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 55d7a82bd071..857b26227d87 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -967,7 +967,7 @@ int agpioc_chipset_flush_wrap(struct agp_file_private *priv)
         return 0;
 }
 
-static int agp_ioctl(struct inode *inode, struct file *file,
+static long agp_ioctl(struct file *file,
                      unsigned int cmd, unsigned long arg)
 {
         struct agp_file_private *curr_priv = file->private_data;
@@ -1058,7 +1058,7 @@ static const struct file_operations agp_fops =
         .llseek         = no_llseek,
         .read           = agp_read,
         .write          = agp_write,
-        .ioctl          = agp_ioctl,
+        .unlocked_ioctl = agp_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = compat_agp_ioctl,
 #endif