diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-27 13:02:58 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-27 13:02:58 +0000 |
| commit | 604fc8faf546ce85c8c6a5204f4dcbd3e5cef8f5 (patch) | |
| tree | 44ea1ba8945d18dc11843298cac9b4bb063f2b11 /target | |
| parent | f38436f607555351bcefcd7cc6497b000ee79381 (diff) | |
| download | upstream-604fc8faf546ce85c8c6a5204f4dcbd3e5cef8f5.tar.gz upstream-604fc8faf546ce85c8c6a5204f4dcbd3e5cef8f5.tar.bz2 upstream-604fc8faf546ce85c8c6a5204f4dcbd3e5cef8f5.zip | |
kernel/generic: fix warnings if libata-ledtrig is disabled
accidentally #if was used instead of #ifdef, thus gcc warned
about CONFIG_ATA_LEDS being undefined...
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
SVN-Revision: 43786
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/patches-3.14/834-ledtrig-libata.patch | 10 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.18/834-ledtrig-libata.patch | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic/patches-3.14/834-ledtrig-libata.patch b/target/linux/generic/patches-3.14/834-ledtrig-libata.patch index b015d7a2fb..ec61ed9e31 100644 --- a/target/linux/generic/patches-3.14/834-ledtrig-libata.patch +++ b/target/linux/generic/patches-3.14/834-ledtrig-libata.patch @@ -57,7 +57,7 @@ index 5c84fb5..eb49e02 100644 return block; } -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS +#define LIBATA_BLINK_DELAY 20 /* ms */ +static inline void ata_led_act(struct ata_port *ap) +{ @@ -77,7 +77,7 @@ index 5c84fb5..eb49e02 100644 break; } } -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS + ata_led_act(ap); +#endif @@ -87,7 +87,7 @@ index 5c84fb5..eb49e02 100644 ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS + ap->ledtrig = kzalloc(sizeof(struct led_trigger), GFP_KERNEL); +#endif ata_sff_port_init(ap); @@ -97,7 +97,7 @@ index 5c84fb5..eb49e02 100644 kfree(ap->pmp_link); kfree(ap->slave_link); -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS + if (ap->ledtrig) { + led_trigger_unregister(ap->ledtrig); + kfree(ap->ledtrig); @@ -110,7 +110,7 @@ index 5c84fb5..eb49e02 100644 host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS + for (i = 0; i < host->n_ports; i++) { + if (unlikely(!host->ports[i]->ledtrig)) + continue; diff --git a/target/linux/generic/patches-3.18/834-ledtrig-libata.patch b/target/linux/generic/patches-3.18/834-ledtrig-libata.patch index b015d7a2fb..ec61ed9e31 100644 --- a/target/linux/generic/patches-3.18/834-ledtrig-libata.patch +++ b/target/linux/generic/patches-3.18/834-ledtrig-libata.patch @@ -57,7 +57,7 @@ index 5c84fb5..eb49e02 100644 return block; } -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS +#define LIBATA_BLINK_DELAY 20 /* ms */ +static inline void ata_led_act(struct ata_port *ap) +{ @@ -77,7 +77,7 @@ index 5c84fb5..eb49e02 100644 break; } } -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS + ata_led_act(ap); +#endif @@ -87,7 +87,7 @@ index 5c84fb5..eb49e02 100644 ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS + ap->ledtrig = kzalloc(sizeof(struct led_trigger), GFP_KERNEL); +#endif ata_sff_port_init(ap); @@ -97,7 +97,7 @@ index 5c84fb5..eb49e02 100644 kfree(ap->pmp_link); kfree(ap->slave_link); -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS + if (ap->ledtrig) { + led_trigger_unregister(ap->ledtrig); + kfree(ap->ledtrig); @@ -110,7 +110,7 @@ index 5c84fb5..eb49e02 100644 host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS + for (i = 0; i < host->n_ports; i++) { + if (unlikely(!host->ports[i]->ledtrig)) + continue; |