diff for duplicates of <200901191350.06538.bzolnier@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 84fa1c4..3ad30a3 100644 Binary files a/a/1.txt and b/N1/1.txt differ diff --git a/a/content_digest b/N1/content_digest index d050c26..b8beaa5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,85 +10,14 @@ "b\0" "\n" "Linus, please pull from:\n" - "\n" "master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/\n" - "\n" "to receive the following updates:\n" + " drivers/ide/falconide.c | 2 +- drivers/ide/ide-probe.c | 3 ++- drivers/ide/palm_bk3710.c | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-)\n" "\n" - " drivers/ide/falconide.c | 2 +-\n" - " drivers/ide/ide-probe.c | 3 ++-\n" - " drivers/ide/palm_bk3710.c | 11 +++++++----\n" - " 3 files changed, 10 insertions(+), 6 deletions(-)\n" - "\n" - "\n" - "Andreas Schwab (1):\n" - " ide: fix IDE PMAC breakage\n" - "\n" - "David Brownell (1):\n" - " drivers/ide/palm_bk3710.c buildfix\n" - "\n" - "Michael Schmitz (1):\n" - " ide: fix Falcon IDE breakage\n" - "\n" + "Andreas Schwab (1): ide: fix IDE PMAC breakage\n" + "David Brownell (1): drivers/ide/palm_bk3710.c buildfix\n" + "Michael Schmitz (1): ide: fix Falcon IDE breakage\n" "\n" - "diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c\n" - "index a5ba820..a638e95 100644\n" - "--- a/drivers/ide/falconide.c\n" - "+++ b/drivers/ide/falconide.c\n" - "@@ -82,7 +82,7 @@ static const struct ide_tp_ops falconide_tp_ops = {\n" - " \n" - " static const struct ide_port_info falconide_port_info = {\n" - " \t.tp_ops\t\t\t= &falconide_tp_ops,\n" - "-\t.host_flags\t\t= IDE_HFLAG_NO_DMA,\n" - "+\t.host_flags\t\t= IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE,\n" - " };\n" - " \n" - " static void __init falconide_setup_ports(hw_regs_t *hw)\n" - "diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c\n" - "index 312127e..0db1ed9 100644\n" - "--- a/drivers/ide/ide-probe.c\n" - "+++ b/drivers/ide/ide-probe.c\n" - "@@ -649,7 +649,8 @@ static int ide_register_port(ide_hwif_t *hwif)\n" - " \t/* register with global device tree */\n" - " \tdev_set_name(&hwif->gendev, hwif->name);\n" - " \thwif->gendev.driver_data = hwif;\n" - "-\thwif->gendev.parent = hwif->dev;\n" - "+\tif (hwif->gendev.parent == NULL)\n" - "+\t\thwif->gendev.parent = hwif->dev;\n" - " \thwif->gendev.release = hwif_release_dev;\n" - " \n" - " \tret = device_register(&hwif->gendev);\n" - "diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c\n" - "index a7ac490..f38aac7 100644\n" - "--- a/drivers/ide/palm_bk3710.c\n" - "+++ b/drivers/ide/palm_bk3710.c\n" - "@@ -346,7 +346,8 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)\n" - " {\n" - " \tstruct clk *clk;\n" - " \tstruct resource *mem, *irq;\n" - "-\tunsigned long base, rate;\n" - "+\tvoid __iomem *base;\n" - "+\tunsigned long rate;\n" - " \tint i, rc;\n" - " \thw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };\n" - " \n" - "@@ -382,11 +383,13 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)\n" - " \tbase = IO_ADDRESS(mem->start);\n" - " \n" - " \t/* Configure the Palm Chip controller */\n" - "-\tpalm_bk3710_chipinit((void __iomem *)base);\n" - "+\tpalm_bk3710_chipinit(base);\n" - " \n" - " \tfor (i = 0; i < IDE_NR_PORTS - 2; i++)\n" - "-\t\thw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i;\n" - "-\thw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET;\n" - "+\t\thw.io_ports_array[i] = (unsigned long)\n" - "+\t\t\t\t(base + IDE_PALM_ATA_PRI_REG_OFFSET + i);\n" - "+\thw.io_ports.ctl_addr = (unsigned long)\n" - "+\t\t\t(base + IDE_PALM_ATA_PRI_CTL_OFFSET);\n" - " \thw.irq = irq->start;\n" - " \thw.dev = &pdev->dev;\n" - " \thw.chipset = ide_palm3710;\n" - "\0" + "diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.cindex a5ba820..a638e95 100644--- a/drivers/ide/falconide.c+++ b/drivers/ide/falconide.c@@ -82,7 +82,7 @@ static const struct ide_tp_ops falconide_tp_ops = { static const struct ide_port_info falconide_port_info = { \t.tp_ops\t\t\t= &falconide_tp_ops,-\t.host_flags\t\t= IDE_HFLAG_NO_DMA,+\t.host_flags\t\t= IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE, }; static void __init falconide_setup_ports(hw_regs_t *hw)diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.cindex 312127e..0db1ed9 100644--- a/drivers/ide/ide-probe.c+++ b/drivers/ide/ide-probe.c@@ -649,7 +649,8 @@ static int ide_register_port(ide_hwif_t *hwif) \t/* register with global device tree */ \tdev_set_name(&hwif->gendev, hwif->name); \thwif->gendev.driver_data = hwif;-\thwif->gendev.parent = hwif->dev;+\tif (hwif->gendev.parent == NULL)+\t\thwif->gendev.parent = hwif->dev; \thwif->gendev.release = hwif_release_dev; \tret = device_register(&hwif->gendev);diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.cindex a7ac490..f38aac7 100644--- a/drivers/ide/palm_bk3710.c+++ b/drivers/ide/palm_bk3710.c@@ -346,7 +346,8 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) { \tstruct clk *clk; \tstruct resource *mem, *irq;-\tunsigned long base, rate;+\tvoid __iomem *base;+\tunsigned long rate; \tint i, rc; \thw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; @@ -382,11 +383,13 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) \tbase = IO_ADDRESS(mem->start); \t/* Configure the Palm Chip controller */-\tpalm_bk3710_chipinit((void __iomem *)base);+\tpalm_bk3710_chipinit(base); \tfor (i = 0; i < IDE_NR_PORTS - 2; i++)-\t\thw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i;-\thw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET;+\t\thw.io_ports_array[i] = (unsigned long)+\t\t\t\t(base + IDE_PALM_ATA_PRI_REG_OFFSET + i);+\thw.io_ports.ctl_addr = (unsigned long)+\t\t\t(base + IDE_PALM_ATA_PRI_CTL_OFFSET); \thw.irq = irq->start; \thw.dev = &pdev->dev; \thw.chipset = ide_palm3710;\0\303\277\303\264\303\250\302\272{.n\303\207+\302\211\302\267\302\237\302\256\302\211\302\255\302\206+%\302\212\303\213\303\277\302\261\303\251\303\235\302\266\027\302\245\302\212w\303\277\302\272{.n\303\207+\302\211\302\267\302\245\302\212{\302\261\303\276G\302\253\302\235\303\251\303\277\302\212{ay\302\272\035\303\212\302\207\303\232\302\231\303\253,j\a\302\255\302\242f\302\243\302\242\302\267h\302\232\302\217\303\257\302\201\303\252\303\277\302\221\303\252\303\247z_\303\250\302\256\003(\302\255\303\251\302\232\302\216\302\212\303\235\302\242j\"\302\235\303\272\032\302\266\033m\302\247\303\277\303\277\302\276\a\302\253\303\276G\302\253\302\235\303\251\303\277\302\242\302\270?\302\231\302\250\303\250\302\255\303\232&\302\243\303\270\302\247~\302\217\303\241\302\266iO\302\225\303\246\302\254z\302\267\302\232v\303\230^\024\004\032\302\266\033m\302\247\303\277\303\277\303\203\f\303\277\302\266\303\254\303\277\302\242\302\270?\302\226I\302\245" -1878ed0de99d40fc32adda456092068e91e397db36e85a03b482c9bf9be62d9c +43acde1f975b678897c16d2b30a60a8f99bd472c6ab47dc6c17daaa8cd22d9ac
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.