This reverts commit b739bce629.
Conflicts:
	arch/arm/configs/htcleo_defconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/board-htcleo.c
		
	
		
			
				
	
	
		
			12 lines
		
	
	
		
			211 B
		
	
	
	
		
			Makefile
		
	
	
	
	
	
			
		
		
	
	
			12 lines
		
	
	
		
			211 B
		
	
	
	
		
			Makefile
		
	
	
	
	
	
| obj-y += dal.o
 | |
| obj-y += q6audio.o
 | |
| obj-y += pcm_out.o
 | |
| obj-y += pcm_in.o
 | |
| obj-y += mp3.o
 | |
| #obj-y += routing.o
 | |
| obj-y += audio_ctl.o
 | |
| obj-y += msm_q6vdec.o
 | |
| obj-y += msm_q6venc.o
 | |
| #obj-y += aac_in.o
 | |
| #obj-y += qcelp_in.o
 |