diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /sound/oss/swarm_cs4297a.c | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'sound/oss/swarm_cs4297a.c')
| -rw-r--r-- | sound/oss/swarm_cs4297a.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c index 1edab7b4ea83..3136c88eacdf 100644 --- a/sound/oss/swarm_cs4297a.c +++ b/sound/oss/swarm_cs4297a.c | |||
| @@ -110,9 +110,6 @@ static void start_adc(struct cs4297a_state *s); | |||
| 110 | // rather than 64k as some of the games work more responsively. | 110 | // rather than 64k as some of the games work more responsively. |
| 111 | // log base 2( buff sz = 32k). | 111 | // log base 2( buff sz = 32k). |
| 112 | 112 | ||
| 113 | //static unsigned long defaultorder = 3; | ||
| 114 | //MODULE_PARM(defaultorder, "i"); | ||
| 115 | |||
| 116 | // | 113 | // |
| 117 | // Turn on/off debugging compilation by commenting out "#define CSDEBUG" | 114 | // Turn on/off debugging compilation by commenting out "#define CSDEBUG" |
| 118 | // | 115 | // |