diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-19 15:40:18 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-19 15:40:18 -0700 |
| commit | 068a565afad3ae818cc0d5495479c4abccc7762c (patch) | |
| tree | 4243dbfa3250cc4da757b3fbc03462267e4e2426 /arch/arm | |
| parent | b55a7a5fbf09ea59777c3b41b6f5cb1ae81aa2bb (diff) | |
| parent | 5276b6877efb8a180e254a06d7497f802f6f9755 (diff) | |
| download | linux-068a565afad3ae818cc0d5495479c4abccc7762c.tar.gz linux-068a565afad3ae818cc0d5495479c4abccc7762c.tar.xz | |
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
A collection of warning fixes on non-ARM code from Arnd Bergmann:
* 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: s3c: mark s3c2440_clk_add as __init_refok
spi/s3c64xx: use correct dma_transfer_direction type
pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit
mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN
SCSI: ARM: make fas216_dumpinfo function conditional
SCSI: ARM: ncr5380/oak uses no interrupts
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c2440.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2440.c b/arch/arm/mach-s3c24xx/clock-s3c2440.c index 749220f91a70..4407b1730539 100644 --- a/arch/arm/mach-s3c24xx/clock-s3c2440.c +++ b/arch/arm/mach-s3c24xx/clock-s3c2440.c @@ -163,7 +163,7 @@ static struct clk_lookup s3c2440_clk_lookup[] = { CLKDEV_INIT(NULL, "clk_uart_baud3", &s3c2440_clk_fclk_n), }; -static int s3c2440_clk_add(struct device *dev, struct subsys_interface *sif) +static int __init_refok s3c2440_clk_add(struct device *dev, struct subsys_interface *sif) { struct clk *clock_upll; struct clk *clock_h; |