Re: Diff between Linus' and linux-mips git: trivial changes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, 19 Feb 2006, Martin Michlmayr wrote:

> diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
> index 6acfa3d..dd628cb 100644
> --- a/drivers/mtd/devices/Kconfig
> +++ b/drivers/mtd/devices/Kconfig
> @@ -47,11 +47,6 @@ config MTD_MS02NV
>  	  accelerator.  Say Y here if you have a DECstation 5000/2x0 or a
>  	  DECsystem 5900 equipped with such a module.
>  
> -	  If you want to compile this driver as a module ( = code which can be
> -	  inserted in and removed from the running kernel whenever you want),
> -	  say M here and read <file:Documentation/modules.txt>.  The module will
> -	  be called ms02-nv.o.
> -
>  config MTD_DATAFLASH
>  	tristate "Support for AT45xxx DataFlash"
>  	depends on MTD && SPI_MASTER && EXPERIMENTAL

 NAK.

> diff --git a/drivers/net/declance.c b/drivers/net/declance.c
> index d049129..6561575 100644
> --- a/drivers/net/declance.c
> +++ b/drivers/net/declance.c
> @@ -1301,7 +1301,6 @@ static void __exit dec_lance_cleanup(voi
>  	while (root_lance_dev) {
>  		struct net_device *dev = root_lance_dev;
>  		struct lance_private *lp = netdev_priv(dev);
> -
>  		unregister_netdev(dev);
>  #ifdef CONFIG_TC
>  		if (lp->slot >= 0)

 NAK.

> diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c
> index e755664..4b86685 100644
> --- a/drivers/scsi/dec_esp.c
> +++ b/drivers/scsi/dec_esp.c
> @@ -55,7 +55,7 @@
>  
>  static int  dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
>  static void dma_drain(struct NCR_ESP *esp);
> -static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd * sp);
> +static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp);
>  static void dma_dump_state(struct NCR_ESP *esp);
>  static void dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length);
>  static void dma_init_write(struct NCR_ESP *esp, u32 vaddress, int length);

 ACK.

> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index 7d7724c..7e63f15 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -1336,8 +1336,8 @@ config FB_PMAGB_B
>   	select FB_CFB_IMAGEBLIT
>  	help
>  	  Support for the PMAGB-B TURBOchannel framebuffer card used mainly
> -	  in the MIPS-based DECstation series. The card is currently only 
> -	  supported in 1280x1024x8 mode.  
> +	  in the MIPS-based DECstation series. The card is currently only
> +	  supported in 1280x1024x8 mode.
>  
>  config FB_MAXINE
>  	bool "Maxine (Personal DECstation) onboard framebuffer support"

 ACK.

 Thanks for looking into it.

  Maciej


[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux