diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-11 07:57:57 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-11 07:57:57 +0200 |
| commit | c664975c0ad36673ed8e438e5e7c60c5771938a0 (patch) | |
| tree | afcd490a1a48cb3d11ca09fe93a19762f0ebd5ff | |
| parent | 8409304c791f4896ad77fad7ad21b3639f674136 (diff) | |
| download | alsa-driver-build-unstable-c664975c0ad36673ed8e438e5e7c60c5771938a0.tar.gz | |
Make sure to undefine CONFIG_SND_HDA_INPUT_JACK in adriver.h
With the older kernel, autoconf.h may still keep CONFIG_SND_HDA_INPUT_JACK=y
while the configure sets CONFIG_SND_JACK=n. We had a hack to undefine
it forcibly, but this should have been done after the inclusion of
autoconf.h. Otherwise it gives Oops in patch_sigmatel.c.
Reported-and-tested-by: Robert Krakora <rob.krakora@messagenetsystems.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | include/adriver.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/adriver.h b/include/adriver.h index 3b8f54605..83fe7ee2a 100644 --- a/include/adriver.h +++ b/include/adriver.h @@ -24,11 +24,6 @@ #include "config.h" -/* hack - CONFIG_SND_HDA_INPUT_JACK can be wrongly set for older kernels */ -#ifndef CONFIG_SND_JACK -#undef CONFIG_SND_HDA_INPUT_JACK -#endif - /* number of supported soundcards */ #ifdef CONFIG_SND_DYNAMIC_MINORS #define SNDRV_CARDS 32 @@ -2011,4 +2006,9 @@ blocking_notifier_chain_unregister(struct blocking_notifier_head *nh, #define nonseekable_open(i,f) 0 #endif +/* hack - CONFIG_SND_HDA_INPUT_JACK can be wrongly set for older kernels */ +#ifndef CONFIG_SND_JACK +#undef CONFIG_SND_HDA_INPUT_JACK +#endif + #endif /* __SOUND_LOCAL_DRIVER_H */ |