diff options
author | Tony Lindgren <tony@atomide.com> | 2014-09-11 22:03:25 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-09-11 22:03:25 +0200 |
commit | 051c544010cf089ca6b8a229546bb7ec2950a54d (patch) | |
tree | 8d6698d92ab189520d3aa3c4c25d6ffc88e12e3d /arch/arm/mach-omap2/common.h | |
parent | ARM: dts: OMAP3+: Add PRM interrupt (diff) | |
parent | ARM: OMAP2+: make of_device_ids const (diff) | |
download | linux-051c544010cf089ca6b8a229546bb7ec2950a54d.tar.xz linux-051c544010cf089ca6b8a229546bb7ec2950a54d.zip |
Merge branch 'omap-for-v3.18/fixes-not-urgent' into omap-for-v3.18/intc-v2
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
-rw-r--r-- | arch/arm/mach-omap2/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index b6d2989d27e2..98fe235f6670 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -307,7 +307,7 @@ static inline void omap4_cpu_resume(void) #endif -void pdata_quirks_init(struct of_device_id *); +void pdata_quirks_init(const struct of_device_id *); void omap_auxdata_legacy_init(struct device *dev); void omap_pcs_legacy_init(int irq, void (*rearm)(void)); |