diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-20 15:47:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-20 15:47:22 -0800 |
| commit | 43fb83c17ba2d63dfb798f0be7453ed55ca3f9c2 (patch) | |
| tree | e77d2dc678ff7927258f4167d424158bf061bf1c /include | |
| parent | 06e47dce8fc3ab68c2ea3b5082caab99e8002b80 (diff) | |
| parent | 9c6cb0377534e77265ea673fd4834f858d5d1a6f (diff) | |
Merge tag 'soc-arm-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC updates from Arnd Bergmann:
"The SoC specific code updates for 6.13 are fairly minimal.
One Broadcom SoC model gains automatic configuration for the debug
uarg as we have on many other machines, the remaining changes are
trivial cleanups"
* tag 'soc-arm-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
ARM: imx: Switch to new sys-off handler API
ARM: bcm: brcmstb: Drop custom init_irq callback
ARM: bcm: Support BCMBCA debug UART
ARM: zynq: Remove unused zynq_slcr_init() declaration
ASoC: samsung: Remove obsoleted declaration for s3c64xx_ac97_setup_gpio
ARM: samsung: Remove obsoleted declaration for s3c_hwmon_set_platdata
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/asoc-s3c.h | 2 | ||||
| -rw-r--r-- | include/linux/platform_data/hwmon-s3c.h | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h index f9c00f839e9f..085dd8e8af76 100644 --- a/include/linux/platform_data/asoc-s3c.h +++ b/include/linux/platform_data/asoc-s3c.h @@ -13,8 +13,6 @@ #include <linux/dmaengine.h> -extern void s3c64xx_ac97_setup_gpio(int); - struct samsung_i2s_type { /* If the Primary DAI has 5.1 Channels */ #define QUIRK_PRI_6CHAN (1 << 0) diff --git a/include/linux/platform_data/hwmon-s3c.h b/include/linux/platform_data/hwmon-s3c.h index 1707ad4147df..7d21e0c41037 100644 --- a/include/linux/platform_data/hwmon-s3c.h +++ b/include/linux/platform_data/hwmon-s3c.h @@ -33,14 +33,4 @@ struct s3c_hwmon_pdata { struct s3c_hwmon_chcfg *in[8]; }; -/** - * s3c_hwmon_set_platdata - Set platform data for S3C HWMON device - * @pd: Platform data to register to device. - * - * Register the given platform data for use with the S3C HWMON device. - * The call will copy the platform data, so the board definitions can - * make the structure itself __initdata. - */ -extern void __init s3c_hwmon_set_platdata(struct s3c_hwmon_pdata *pd); - #endif /* __HWMON_S3C_H__ */ |