Merge branch 'for-2.6.29' into for-2.6.30 · 2905a5df4a - Gogs

Merge branch 'for-2.6.29' into for-2.6.30

Mark Brown 16 years ago

parent

0465c7aa6f 591046cfc5

commit

2905a5df4a

1 changed files with 0 additions and 2 deletions

Unified View Show Diff Stats

						
							+ 0
							
							- 2
						
sound/soc/atmel/atmel-pcm.c
							 
								View File
							
															@@ -44,8 +44,6 @@
														
															 #include <sound/pcm_params.h>
														
															 #include <sound/pcm_params.h>
														
															 #include <sound/soc.h>
														
															 #include <sound/soc.h>
														
															-#include <mach/hardware.h>
														
															-
														
															 #include "atmel-pcm.h"
														
															 #include "atmel-pcm.h"