diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2018-11-28 13:57:23 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-12-04 22:37:38 +0000 |
| commit | d66a2fb8d7b0a103f5d6884ff9db895959bf0924 (patch) | |
| tree | 29fc1fcf0ae320596579e724cccbe9ae08acbb90 /arch/arm/mach-sa1100/h3100.c | |
| parent | Linux 4.20-rc1 (diff) | |
| download | linux-dev-d66a2fb8d7b0a103f5d6884ff9db895959bf0924.tar.xz linux-dev-d66a2fb8d7b0a103f5d6884ff9db895959bf0924.zip | |
ARM: sa1100: explicitly register sa11x0-pcmcia devices
Simplify the code by getting rid of the conditional automatic
registration of the sa11x0 PCMCIA interfaces in sa1100_init(), and
require all platforms to explicitly call sa11x0_register_pcmcia().
Only one platform (iPAQ) is affected by this change.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/h3100.c')
| -rw-r--r-- | arch/arm/mach-sa1100/h3100.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/h3100.c b/arch/arm/mach-sa1100/h3100.c index c6b412054a3c..9dc5bcb7326b 100644 --- a/arch/arm/mach-sa1100/h3100.c +++ b/arch/arm/mach-sa1100/h3100.c @@ -126,6 +126,7 @@ static void __init h3100_mach_init(void) { h3xxx_mach_init(); + sa11x0_register_pcmcia(-1, NULL); sa11x0_register_lcd(&h3100_lcd_info); sa11x0_register_irda(&h3100_irda_data); } |