Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26883
b: refs/heads/master
c: db31419
h: refs/heads/master
i:
  26881: 353705e
  26879: 7ba7acb
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed May 21, 2006
1 parent ba2a0f5 commit 56b01e2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 1caef6aa97a3a43a82f238d8b31bf177de34a4bf
refs/heads/master: db31419404e5ccc7e8e07000a5f1ac440a0eafa0
6 changes: 3 additions & 3 deletions trunk/sound/oss/nm256_audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ static struct ac97_mixer_value_list mixer_defaults[] = {


/* Installs the AC97 mixer into CARD. */
static int __init
static int __devinit
nm256_install_mixer (struct nm256_info *card)
{
int mixer;
Expand Down Expand Up @@ -995,7 +995,7 @@ nm256_install_mixer (struct nm256_info *card)
* RAM.
*/

static void __init
static void __devinit
nm256_peek_for_sig (struct nm256_info *card)
{
u32 port1offset
Expand Down Expand Up @@ -1056,7 +1056,7 @@ nm256_install(struct pci_dev *pcidev, enum nm256rev rev, char *verstr)
card->playing = 0;
card->recording = 0;
card->rev = rev;
spin_lock_init(&card->lock);
spin_lock_init(&card->lock);

/* Init the memory port info. */
for (x = 0; x < 2; x++) {
Expand Down

0 comments on commit 56b01e2

Please sign in to comment.