diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-16 22:58:08 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-16 22:58:58 -0500 |
| commit | 5046e385b4426e229a6beb4bce480762af91a6fc (patch) | |
| tree | 65b4bff2c913a18840b3c58892853d51b942ac43 /arch/arm/common/sa1111.c | |
| parent | a73b59c51ab288d81b515b504790267f594884b8 (diff) | |
| parent | b86dc0d8c12bbb9fed3f392c284bdc7114ce00c1 (diff) | |
Merge branch 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
From Kukjin Kim:
That branch fixes build error for S3C24XX/S3C64xx. And corrects dw-mshc
properties on EXYNOS5 DT and fixes IRQ mapping on Cragganmore board.
* 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
ARM: dts: correct the dw-mshc timing properties as per binding
ARM: S3C64XX: Fix build error with CONFIG_S3C_DEV_FB disabled
+ Linux 3.8-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/common/sa1111.c')
| -rw-r--r-- | arch/arm/common/sa1111.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 9173d112ea01..e57d7e5bf96a 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
| @@ -686,8 +686,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, | |||
| 686 | * %-EINVAL no platform data passed | 686 | * %-EINVAL no platform data passed |
| 687 | * %0 successful. | 687 | * %0 successful. |
| 688 | */ | 688 | */ |
| 689 | static int __devinit | 689 | static int __sa1111_probe(struct device *me, struct resource *mem, int irq) |
| 690 | __sa1111_probe(struct device *me, struct resource *mem, int irq) | ||
| 691 | { | 690 | { |
| 692 | struct sa1111_platform_data *pd = me->platform_data; | 691 | struct sa1111_platform_data *pd = me->platform_data; |
| 693 | struct sa1111 *sachip; | 692 | struct sa1111 *sachip; |
| @@ -1011,7 +1010,7 @@ static int sa1111_resume(struct platform_device *dev) | |||
| 1011 | #define sa1111_resume NULL | 1010 | #define sa1111_resume NULL |
| 1012 | #endif | 1011 | #endif |
| 1013 | 1012 | ||
| 1014 | static int __devinit sa1111_probe(struct platform_device *pdev) | 1013 | static int sa1111_probe(struct platform_device *pdev) |
| 1015 | { | 1014 | { |
| 1016 | struct resource *mem; | 1015 | struct resource *mem; |
| 1017 | int irq; | 1016 | int irq; |