Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #54 from micgeri/zte-openc_eu-3.4-jb
Browse files Browse the repository at this point in the history
Bug 1239761 - Make Open C EU kernel build work r=gerard-majax
  • Loading branch information
lissyx committed Jan 14, 2016
2 parents 2a0006a + 5a084e2 commit e3c1254
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-msm/smd_init_dt.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <linux/io.h>

#include <mach/msm_ipc_logging.h>
#include <smd_private.h>
#include "smd_private.h"

#define MODULE_NAME "msm_smd"
#define IPC_LOG(level, x...) do { \
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/msm8x10-wcd-tables.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* GNU General Public License for more details.
*/

#include <msm8x10_wcd_registers.h>
#include "msm8x10_wcd_registers.h"
#include "msm8x10-wcd.h"

const u8 msm8x10_wcd_reg_readable[MSM8X10_WCD_CACHE_SIZE] = {
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/msm/msm8x10.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <sound/jack.h>
#include <asm/mach-types.h>
#include <mach/socinfo.h>
#include <qdsp6v2/msm-pcm-routing-v2.h>
#include "qdsp6v2/msm-pcm-routing-v2.h"
#include <sound/q6afe-v2.h>
#include <linux/module.h>
#include <mach/gpiomux.h>
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/msm/qdsp6v2/rtac.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <sound/q6asm-v2.h>
#include <sound/q6afe-v2.h>
#include <sound/apr_audio-v2.h>
#include <q6voice.h>
#include "q6voice.h"
#include "audio_acdb.h"


Expand Down

0 comments on commit e3c1254

Please sign in to comment.