diff for duplicates of <20100830081231.GL9832@bicker> diff --git a/a/1.txt b/N1/1.txt index 94fafa0..f7b57c8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,8 @@ index c6aa52f..729ba8f 100644 +++ b/drivers/staging/comedi/drivers/das08_cs.c @@ -222,7 +222,7 @@ static int das08_pcmcia_config_loop(struct pcmcia_device *p_dev, p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH; - p_dev->resource[0]->flags | pcmcia_io_cfg_data_width(io->flags); + p_dev->resource[0]->flags |= + pcmcia_io_cfg_data_width(io->flags); - p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; + p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK; p_dev->resource[0]->start = io->win[0].base; diff --git a/a/content_digest b/N1/content_digest index 4a08db8..9bad717 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch] pcmcia: comedi: fix compile error\0" - "Date\0Mon, 30 Aug 2010 08:14:45 +0000\0" + "Date\0Mon, 30 Aug 2010 10:14:45 +0200\0" "To\0Greg Kroah-Hartman <gregkh@suse.de>\0" "Cc\0Dominik Brodowski <linux@dominikbrodowski.net>" Marcel Holtmann <marcel@holtmann.org> @@ -24,11 +24,12 @@ "+++ b/drivers/staging/comedi/drivers/das08_cs.c\n" "@@ -222,7 +222,7 @@ static int das08_pcmcia_config_loop(struct pcmcia_device *p_dev,\n" " \t\tp_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;\n" - " \t\tp_dev->resource[0]->flags | \t\t\tpcmcia_io_cfg_data_width(io->flags);\n" + " \t\tp_dev->resource[0]->flags |=\n" + " \t\t\tpcmcia_io_cfg_data_width(io->flags);\n" "-\t\tp_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;\n" "+\t\tp_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;\n" " \t\tp_dev->resource[0]->start = io->win[0].base;\n" " \t\tp_dev->resource[0]->end = io->win[0].len;\n" " \t\tif (io->nwin > 1) {" -c6a8b959738d63af1067fa72b8783aaef20e1c3e98b867035d8eb5adb64a2855 +1b5de192a22d7f3260eee4036d5bbbe1ccc32a6bff443053f68660df420148ab
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.