diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
| commit | f987e832a9e79d2ce8009a5ea9c7b677624b3b30 (patch) | |
| tree | 0dd09a5e6b4c60ee0a9916907dfc2cda83f3e496 /sound/soc/codecs/aic326x_tiload.h | |
| parent | f737b7f46a72c099cf8ac88baff02fbf61b1a47c (diff) | |
| parent | fc993d9bc48f772133d8cd156c67c296477db070 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/usb_phy.c
drivers/usb/gadget/tegra_udc.c
drivers/usb/otg/Makefile
drivers/video/tegra/fb.c
sound/soc/tegra/tegra_pcm.c
Diffstat (limited to 'sound/soc/codecs/aic326x_tiload.h')
| -rw-r--r-- | sound/soc/codecs/aic326x_tiload.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/codecs/aic326x_tiload.h b/sound/soc/codecs/aic326x_tiload.h index 6621a4127b16..c11d8a2d06f7 100644 --- a/sound/soc/codecs/aic326x_tiload.h +++ b/sound/soc/codecs/aic326x_tiload.h @@ -2,7 +2,7 @@ * linux/sound/soc/codecs/aic3262_tiload.h * * - * Copyright (C) 2012 Texas Instruments, Inc. + * Copyright (C) 2011 Texas Instruments Inc. * * * @@ -24,9 +24,6 @@ #ifndef _AIC3262_TILOAD_H #define _AIC3262_TILOAD_H -/* typedefs required for the included header files */ -typedef char *string; - /* defines */ #define DEVICE_NAME "tiload_node" #define aic3262_IOC_MAGIC 0xE0 |