diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-09 13:59:49 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-09 14:13:06 -0400 |
| commit | 8167415e924e556358e8e6117414dba4e68a4c18 (patch) | |
| tree | 896d93b7f4922dda7801cd30ef0d4410517cd71e | |
| parent | 651d22035cf47444b0ebec1ab4a401c23b5fc883 (diff) | |
| download | longterm-queue-2.6.34-8167415e924e556358e8e6117414dba4e68a4c18.tar.gz | |
fix two whitespace errors
28: Applying: USB: gamin_gps: Fix for data transfer problems in native mode
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:69: trailing whitespace.
} else if (bulk_data ||
warning: 1 line adds whitespace errors.
[...]
68: Applying: pata_cm64x: fix boot crash on parisc
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:26: trailing whitespace.
const struct ata_port_info *ppi[] = {
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:74: trailing whitespace.
warning: 2 lines add whitespace errors.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/USB-gamin_gps-Fix-for-data-transfer-problems-in-nati.patch | 2 | ||||
| -rw-r--r-- | queue/pata_cm64x-fix-boot-crash-on-parisc.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/queue/USB-gamin_gps-Fix-for-data-transfer-problems-in-nati.patch b/queue/USB-gamin_gps-Fix-for-data-transfer-problems-in-nati.patch index f1bcdbb..cf8edc7 100644 --- a/queue/USB-gamin_gps-Fix-for-data-transfer-problems-in-nati.patch +++ b/queue/USB-gamin_gps-Fix-for-data-transfer-problems-in-nati.patch @@ -82,7 +82,7 @@ index a42b29a..c2bc179 100644 if (garmin_data_p->flags & FLAGS_QUEUING) { pkt_add(garmin_data_p, data, data_length); - } else if (getLayerId(data) == GARMIN_LAYERID_APPL) { -+ } else if (bulk_data || ++ } else if (bulk_data || + getLayerId(data) == GARMIN_LAYERID_APPL) { spin_lock_irqsave(&garmin_data_p->lock, flags); diff --git a/queue/pata_cm64x-fix-boot-crash-on-parisc.patch b/queue/pata_cm64x-fix-boot-crash-on-parisc.patch index c37fce4..0498021 100644 --- a/queue/pata_cm64x-fix-boot-crash-on-parisc.patch +++ b/queue/pata_cm64x-fix-boot-crash-on-parisc.patch @@ -44,7 +44,7 @@ index 4c81a71..c54e9af 100644 }; - const struct ata_port_info *ppi[] = { &cmd_info[id->driver_data], NULL }; - u8 mrdmode; -+ const struct ata_port_info *ppi[] = { ++ const struct ata_port_info *ppi[] = { + &cmd_info[id->driver_data], + &cmd_info[id->driver_data], + NULL @@ -92,7 +92,7 @@ index 4c81a71..c54e9af 100644 + if (port_ok && cntrl_ch0_ok && !(reg & CNTRL_CH0)) { + dev_printk(KERN_NOTICE, &pdev->dev, "Primary port is disabled\n"); + ppi[0] = &ata_dummy_port_info; -+ ++ + } + if (port_ok && !(reg & CNTRL_CH1)) { + dev_printk(KERN_NOTICE, &pdev->dev, "Secondary port is disabled\n"); |