Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 764e028e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'staging-linus' of... 

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6:
  Staging: ath6kl: remove empty files that mess with 'distclean'
  staging: ath6kl: Fixing the driver to use modified mmc_host structure
  Staging: solo6x10: fix build problem
parents 934648f0 557a3dac

drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -285,9 +285,9 @@ A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_I 
    do {

    do {

        

        

            /* check if host supports scatter requests and it meets our requirements */

            /* check if host supports scatter requests and it meets our requirements */

        if (device->func->card->host->max_hw_segs < MAX_SCATTER_ENTRIES_PER_REQ) {

        if (device->func->card->host->max_segs < MAX_SCATTER_ENTRIES_PER_REQ) {

            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("HIF-SCATTER : host only supports scatter of : %d entries, need: %d \n",

            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("HIF-SCATTER : host only supports scatter of : %d entries, need: %d \n",

                    device->func->card->host->max_hw_segs, MAX_SCATTER_ENTRIES_PER_REQ));

                    device->func->card->host->max_segs, MAX_SCATTER_ENTRIES_PER_REQ));

            status = A_ENOTSUP;

            status = A_ENOTSUP;

            break;    

            break;    

        }

        }

drivers/staging/ath6kl/os/linux/include/athendpack_linux.h

deleted100644 → 0
+0 −0

Empty file deleted.

drivers/staging/ath6kl/os/linux/include/athstartpack_linux.h

deleted100644 → 0
+0 −0

Empty file deleted.

drivers/staging/solo6x10/solo6010-v4l2-enc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -766,7 +766,7 @@ static int solo_enc_open(struct file *file) 
				    &solo_enc->lock,

				    &solo_enc->lock,

				    V4L2_BUF_TYPE_VIDEO_CAPTURE,

				    V4L2_BUF_TYPE_VIDEO_CAPTURE,

				    V4L2_FIELD_INTERLACED,

				    V4L2_FIELD_INTERLACED,

				    sizeof(struct videobuf_buffer), fh);

				    sizeof(struct videobuf_buffer), fh, NULL);





	spin_unlock(&solo_enc->lock);

	spin_unlock(&solo_enc->lock);

drivers/staging/solo6x10/solo6010-v4l2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -437,7 +437,7 @@ static int solo_v4l2_open(struct file *file) 
				    &solo_dev->pdev->dev, &fh->slock,

				    &solo_dev->pdev->dev, &fh->slock,

				    V4L2_BUF_TYPE_VIDEO_CAPTURE,

				    V4L2_BUF_TYPE_VIDEO_CAPTURE,

				    SOLO_DISP_PIX_FIELD,

				    SOLO_DISP_PIX_FIELD,

				    sizeof(struct videobuf_buffer), fh);

				    sizeof(struct videobuf_buffer), fh, NULL);





	return 0;

	return 0;

}

}