Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sound: remove checks for CONFIG_BCM_CS4297A_CSWARM

Checks for CONFIG_BCM_CS4297A_CSWARM were added in v2.6.11. The related
Kconfig symbol was never added so these checks always evaluated to true.
Remove them.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Paul Bolle and committed by
Takashi Iwai
55d0cc29 532895c5

-4
-4
sound/oss/swarm_cs4297a.c
··· 2625 2625 u32 pwr, id; 2626 2626 mm_segment_t fs; 2627 2627 int rval; 2628 - #ifndef CONFIG_BCM_CS4297A_CSWARM 2629 2628 u64 cfg; 2630 2629 int mdio_val; 2631 - #endif 2632 2630 2633 2631 CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 2634 2632 "cs4297a: cs4297a_init_module()+ \n")); 2635 2633 2636 - #ifndef CONFIG_BCM_CS4297A_CSWARM 2637 2634 mdio_val = __raw_readq(KSEG1 + A_MAC_REGISTER(2, R_MAC_MDIO)) & 2638 2635 (M_MAC_MDIO_DIR|M_MAC_MDIO_OUT); 2639 2636 ··· 2656 2659 __raw_writeq(mdio_val | M_MAC_GENC, KSEG1+A_MAC_REGISTER(2, R_MAC_MDIO)); 2657 2660 /* Give the codec some time to finish resetting (start the bit clock) */ 2658 2661 udelay(100); 2659 - #endif 2660 2662 2661 2663 if (!(s = kzalloc(sizeof(struct cs4297a_state), GFP_KERNEL))) { 2662 2664 CS_DBGOUT(CS_ERROR, 1, printk(KERN_ERR