diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:24:38 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:24:38 -0600 |
| commit | 41286b07d6132a655777bdecc5ec80784ce80939 (patch) | |
| tree | 61c294bbb461c47ff54ca1b55faea6d38b7b3907 | |
| parent | 74ca9a1a15a6caa56439abc2f7252a599d5c2757 (diff) | |
Bugzilla 766 - PATA_FSL: probe not called when module
Patch for Bugzilla 766 - PATA_FSL: probe not called when module. Fixed
by ensuring the platform_device gets registered even when PATA_FSL is a
module. Linux 2.6.22 kernel on MX platforms.
http://www.bitshrine.org/gpp/linux-2.6.22-mx-Bugzilla-766-PATA_FSL-probe-not-called-whe.patch
| -rw-r--r-- | arch/arm/mach-mx27/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/devices.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-mx27/devices.c b/arch/arm/mach-mx27/devices.c index 1264edd87e5b..202816f62d61 100644 --- a/arch/arm/mach-mx27/devices.c +++ b/arch/arm/mach-mx27/devices.c @@ -600,7 +600,7 @@ static inline void mxc_init_dptc(void) } #endif -#ifdef CONFIG_PATA_FSL +#if defined(CONFIG_PATA_FSL) || defined(CONFIG_PATA_FSL_MODULE) static struct clk *ata_clk; extern void gpio_ata_active(void); extern void gpio_ata_inactive(void); diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index 6fcf01d66bed..779321960591 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c @@ -871,6 +871,7 @@ static inline void mxc_init_vpu(void) } #endif +#if defined(CONFIG_PATA_FSL) || defined(CONFIG_PATA_FSL_MODULE) static struct clk *ata_clk; extern void gpio_ata_active(void); extern void gpio_ata_inactive(void); @@ -950,6 +951,11 @@ static inline void mxc_init_pata(void) { (void)platform_device_register(&pata_fsl_device); } +#else /* CONFIG_PATA_FSL */ +static inline void mxc_init_pata(void) +{ +} +#endif /* CONFIG_PATA_FSL */ static int __init mxc_init_devices(void) { |