git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libata: Add another column to the ata_timing table.
[safe/jmp/linux-2.6]
/
include
/
sound
/
cs46xx.h
diff --git
a/include/sound/cs46xx.h
b/include/sound/cs46xx.h
index
685928e
..
e3005a6
100644
(file)
--- a/
include/sound/cs46xx.h
+++ b/
include/sound/cs46xx.h
@@
-2,7
+2,7
@@
#define __SOUND_CS46XX_H
/*
#define __SOUND_CS46XX_H
/*
- * Copyright (c) by Jaroslav Kysela <perex@
suse
.cz>,
+ * Copyright (c) by Jaroslav Kysela <perex@
perex
.cz>,
* Cirrus Logic, Inc.
* Definitions for Cirrus Logic CS46xx chips
*
* Cirrus Logic, Inc.
* Definitions for Cirrus Logic CS46xx chips
*
@@
-1708,9
+1708,6
@@
struct snd_cs46xx {
struct gameport *gameport;
struct gameport *gameport;
-#ifdef CONFIG_SND_CS46XX_DEBUG_GPIO
- int current_gpio;
-#endif
#ifdef CONFIG_SND_CS46XX_NEW_DSP
struct mutex spos_mutex;
#ifdef CONFIG_SND_CS46XX_NEW_DSP
struct mutex spos_mutex;
@@
-1723,6
+1720,10
@@
struct snd_cs46xx {
struct snd_cs46xx_pcm *playback_pcm;
unsigned int play_ctl;
#endif
struct snd_cs46xx_pcm *playback_pcm;
unsigned int play_ctl;
#endif
+
+#ifdef CONFIG_PM
+ u32 *saved_regs;
+#endif
};
int snd_cs46xx_create(struct snd_card *card,
};
int snd_cs46xx_create(struct snd_card *card,