upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / drivers / char / agp / hp-agp.c

diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index 4f1cb2c..3f8c2d4 100644 (file)
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -524,6 +524,8 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)
 static int __init
 agp_hp_init (void)
 {
+       if (agp_off)
+               return -EINVAL;
 
        acpi_get_devices("HWP0003", zx1_gart_probe, "HWP0003", NULL);
        if (hp_zx1_gart_found)