From 79b0d6c57ef107f5783b14680196b75bb52b72fc Mon Sep 17 00:00:00 2001 From: Robert Hancock Date: Tue, 19 Jan 2010 23:03:39 -0600 Subject: [PATCH] --- yaml --- r: 183158 b: refs/heads/master c: 9ffc5da5e1e57592da9c22d83a98c63afc8d985c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci.c | 8 ++++---- trunk/drivers/ata/pata_pcmcia.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0181be13aa47..a7c166132db5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27943620cbd960f710a385ff4a538e14ed3f1922 +refs/heads/master: 9ffc5da5e1e57592da9c22d83a98c63afc8d985c diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c index 89d66fa725a4..6bd930b93bcc 100644 --- a/trunk/drivers/ata/ahci.c +++ b/trunk/drivers/ata/ahci.c @@ -375,10 +375,10 @@ static ssize_t ahci_show_host_version(struct device *dev, static ssize_t ahci_show_port_cmd(struct device *dev, struct device_attribute *attr, char *buf); -DEVICE_ATTR(ahci_host_caps, S_IRUGO, ahci_show_host_caps, NULL); -DEVICE_ATTR(ahci_host_cap2, S_IRUGO, ahci_show_host_cap2, NULL); -DEVICE_ATTR(ahci_host_version, S_IRUGO, ahci_show_host_version, NULL); -DEVICE_ATTR(ahci_port_cmd, S_IRUGO, ahci_show_port_cmd, NULL); +static DEVICE_ATTR(ahci_host_caps, S_IRUGO, ahci_show_host_caps, NULL); +static DEVICE_ATTR(ahci_host_cap2, S_IRUGO, ahci_show_host_cap2, NULL); +static DEVICE_ATTR(ahci_host_version, S_IRUGO, ahci_show_host_version, NULL); +static DEVICE_ATTR(ahci_port_cmd, S_IRUGO, ahci_show_port_cmd, NULL); static struct device_attribute *ahci_shost_attrs[] = { &dev_attr_link_power_management_policy, diff --git a/trunk/drivers/ata/pata_pcmcia.c b/trunk/drivers/ata/pata_pcmcia.c index 1b392c9e8531..36103531feeb 100644 --- a/trunk/drivers/ata/pata_pcmcia.c +++ b/trunk/drivers/ata/pata_pcmcia.c @@ -136,7 +136,7 @@ static unsigned int ata_data_xfer_8bit(struct ata_device *dev, * */ -void pcmcia_8bit_drain_fifo(struct ata_queued_cmd *qc) +static void pcmcia_8bit_drain_fifo(struct ata_queued_cmd *qc) { int count; struct ata_port *ap;