diff --git a/[refs] b/[refs] index d96be28312e4..87324d9aa019 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0946687803ff5495e4b7c0b7f2c6d002398bd5fa +refs/heads/master: 4fd1f8414664b3e834aa46cdbf8f0c12fc42a878 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c index bab42a1351ca..c366ad55f70e 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -4163,7 +4163,7 @@ static void iwl3945_rx_allocate(struct iwl3945_priv *priv) /* * this should be called while priv->lock is locked */ -void __iwl3945_rx_replenish(void *data) +static void __iwl3945_rx_replenish(void *data) { struct iwl3945_priv *priv = data; diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c index 3a9f14d8f26a..7550594ed4fc 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -4534,7 +4534,7 @@ static void iwl4965_rx_allocate(struct iwl4965_priv *priv) /* * this should be called while priv->lock is locked */ -void __iwl4965_rx_replenish(void *data) +static void __iwl4965_rx_replenish(void *data) { struct iwl4965_priv *priv = data; @@ -6038,7 +6038,7 @@ static void iwl4965_dealloc_ucode_pci(struct iwl4965_priv *priv) * iwl4965_verify_inst_full - verify runtime uCode image in card vs. host, * looking at all data. */ -static int iwl4965_verify_inst_full(struct iwl4965_priv *priv, __le32 * image, +static int iwl4965_verify_inst_full(struct iwl4965_priv *priv, __le32 *image, u32 len) { u32 val;