Merge branches 'release' and 'fluff' into release

[linux-2.6-omap-h63xx.git] / drivers / acpi / bay.c

diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 477711435b24e10784a6142acac33cf79a5ee50d..1fa86811b8ee6ee8e5e675666fc1092f0b4c6eb5 100644 (file)
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -134,7 +134,7 @@ static ssize_t show_present(struct device *dev,
        return snprintf(buf, PAGE_SIZE, "%d\n", bay_present(bay));
 
 }
-DEVICE_ATTR(present, S_IRUGO, show_present, NULL);
+static DEVICE_ATTR(present, S_IRUGO, show_present, NULL);
 
 /*
  * write_eject - write method for "eject" file in sysfs
@@ -150,7 +150,7 @@ static ssize_t write_eject(struct device *dev, struct device_attribute *attr,
        eject_device(bay->handle);
        return count;
 }
-DEVICE_ATTR(eject, S_IWUSR, NULL, write_eject);
+static DEVICE_ATTR(eject, S_IWUSR, NULL, write_eject);
 
 /**
  * is_ata - see if a device is an ata device