On Sun, Sep 14, 2014 at 04:59:03PM +0100, Mark Einon wrote: > Fix two lines where mixed tabs and spaces were used for indenting. > > Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx> > --- > drivers/staging/et131x/et131x.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c > index 8b2f9a9..c158b01 100644 > --- a/drivers/staging/et131x/et131x.c > +++ b/drivers/staging/et131x/et131x.c > @@ -579,7 +579,7 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data) > * byte addressing). > */ > if (pci_write_config_byte(pdev, LBCIF_CONTROL_REGISTER, > - LBCIF_CONTROL_LBCIF_ENABLE | > + LBCIF_CONTROL_LBCIF_ENABLE | > LBCIF_CONTROL_I2C_WRITE)) > return -EIO; > > @@ -837,7 +837,7 @@ static void et131x_rx_dma_disable(struct et131x_adapter *adapter) > if (!(csr & ET_RXDMA_CSR_HALT_STATUS)) > dev_err(&adapter->pdev->dev, > "RX Dma failed to enter halt state. CSR 0x%08x\n", > - csr); > + csr); > } > } > This patch didn't apply, as I think it is already in the tree. All others did. thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
