diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 10:43:50 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 10:43:50 +0400 |
| commit | 24a118de116856323f51c664102b6afdad6a8be7 (patch) | |
| tree | c9f575a7742fb95ff69009308a36868bebf54eed /include/linux/platform_data | |
| parent | 5886c743799f9190304b40255519cea5b50164ca (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
| download | linux-24a118de116856323f51c664102b6afdad6a8be7.tar.xz | |
Merge tag 'v3.7-rc6' into asoc-arizona
Linux 3.7-rc6
Conflicts:
sound/soc/codecs/wm5102.c
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/omap_ocp2scp.h | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/include/linux/platform_data/omap_ocp2scp.h b/include/linux/platform_data/omap_ocp2scp.h new file mode 100644 index 000000000000..5c6c3939355f --- /dev/null +++ b/include/linux/platform_data/omap_ocp2scp.h @@ -0,0 +1,31 @@ +/* + * omap_ocp2scp.h -- ocp2scp header file + * + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Author: Kishon Vijay Abraham I <kishon@ti.com> + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#ifndef __DRIVERS_OMAP_OCP2SCP_H +#define __DRIVERS_OMAP_OCP2SCP_H + +struct omap_ocp2scp_dev { + const char *drv_name; + struct resource *res; +}; + +struct omap_ocp2scp_platform_data { + int dev_cnt; + struct omap_ocp2scp_dev **devices; +}; +#endif /* __DRIVERS_OMAP_OCP2SCP_H */ |