diff options
author | Tony Lindgren <tony@atomide.com> | 2013-12-08 17:15:35 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-12-08 17:15:35 -0500 |
commit | 841af81f7a180f5793cb0d82a7a7626bbc17c028 (patch) | |
tree | 46107f319d52a729ffcd76238df6285d8810f358 /arch/arm/mach-omap2/omap_hwmod_common_data.h | |
parent | f2e2c9d9b4087b74eb9e00d8dfac148354cb0b71 (diff) | |
parent | 218077a3c03d8c136691a0020424633525fcdc85 (diff) |
Merge branch 'omap-for-v3.14/board-removal' into omap-for-v3.14/omap3-board-removal
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_common_data.h')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_common_data.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_common_data.h b/arch/arm/mach-omap2/omap_hwmod_common_data.h index 6e04ff7065e1..2c38c6b0ee03 100644 --- a/arch/arm/mach-omap2/omap_hwmod_common_data.h +++ b/arch/arm/mach-omap2/omap_hwmod_common_data.h | |||
@@ -18,9 +18,6 @@ | |||
18 | #include "common.h" | 18 | #include "common.h" |
19 | #include "display.h" | 19 | #include "display.h" |
20 | 20 | ||
21 | /* Common address space across OMAP2xxx */ | ||
22 | extern struct omap_hwmod_addr_space omap2xxx_mcbsp2_addrs[]; | ||
23 | |||
24 | /* Common address space across OMAP2xxx/3xxx */ | 21 | /* Common address space across OMAP2xxx/3xxx */ |
25 | extern struct omap_hwmod_addr_space omap2_i2c1_addr_space[]; | 22 | extern struct omap_hwmod_addr_space omap2_i2c1_addr_space[]; |
26 | extern struct omap_hwmod_addr_space omap2_i2c2_addr_space[]; | 23 | extern struct omap_hwmod_addr_space omap2_i2c2_addr_space[]; |
@@ -41,8 +38,6 @@ extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[]; | |||
41 | extern struct omap_hwmod_addr_space omap2_hdq1w_addr_space[]; | 38 | extern struct omap_hwmod_addr_space omap2_hdq1w_addr_space[]; |
42 | 39 | ||
43 | /* Common IP block data across OMAP2xxx */ | 40 | /* Common IP block data across OMAP2xxx */ |
44 | extern struct omap_hwmod_irq_info omap2xxx_timer12_mpu_irqs[]; | ||
45 | extern struct omap_hwmod_dma_info omap2xxx_dss_sdma_chs[]; | ||
46 | extern struct omap_gpio_dev_attr omap2xxx_gpio_dev_attr; | 41 | extern struct omap_gpio_dev_attr omap2xxx_gpio_dev_attr; |
47 | extern struct omap_hwmod omap2xxx_l3_main_hwmod; | 42 | extern struct omap_hwmod omap2xxx_l3_main_hwmod; |
48 | extern struct omap_hwmod omap2xxx_l4_core_hwmod; | 43 | extern struct omap_hwmod omap2xxx_l4_core_hwmod; |