Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 86157
b: refs/heads/master
c: 92eed66
h: refs/heads/master
i:
  86155: 7acea97
v: v3
  • Loading branch information
Takashi Iwai authored and Linus Torvalds committed Feb 22, 2008
1 parent 9f2025a commit 0bf8fd7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f007dc045a93aeb7e03fe59b408bc65baa86d991
refs/heads/master: 92eed66d5e612216369b27330ac43f6f094d0130
7 changes: 3 additions & 4 deletions trunk/sound/pci/rme9652/hdsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ static int hdsp_get_iobox_version (struct hdsp *hdsp)


#ifdef HDSP_FW_LOADER
static int __devinit hdsp_request_fw_loader(struct hdsp *hdsp);
static int hdsp_request_fw_loader(struct hdsp *hdsp);
#endif

static int hdsp_check_for_firmware (struct hdsp *hdsp, int load_on_demand)
Expand Down Expand Up @@ -4688,8 +4688,7 @@ static struct snd_pcm_ops snd_hdsp_capture_ops = {
.copy = snd_hdsp_capture_copy,
};

static int __devinit snd_hdsp_create_hwdep(struct snd_card *card,
struct hdsp *hdsp)
static int snd_hdsp_create_hwdep(struct snd_card *card, struct hdsp *hdsp)
{
struct snd_hwdep *hw;
int err;
Expand Down Expand Up @@ -4857,7 +4856,7 @@ static int snd_hdsp_create_alsa_devices(struct snd_card *card, struct hdsp *hdsp

#ifdef HDSP_FW_LOADER
/* load firmware via hotplug fw loader */
static int __devinit hdsp_request_fw_loader(struct hdsp *hdsp)
static int hdsp_request_fw_loader(struct hdsp *hdsp)
{
const char *fwfile;
const struct firmware *fw;
Expand Down

0 comments on commit 0bf8fd7

Please sign in to comment.