diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-22 03:44:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-22 03:44:59 -0400 |
| commit | 8fd90bb889635fa1e7f80a3950948cc2e74c1446 (patch) | |
| tree | 1490343b5ad9f88b9333e53fa9457c00cbf6c2d1 /drivers/staging | |
| parent | 1bb4238b17b5de6cdc120970a9d00dd8a44f40df (diff) | |
| parent | 15ba2236f3556fc01b9ca91394465152b5ea74b6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/infiniband/hw/cxgb4/device.c
The cxgb4 conflict was simply overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/omap4iss/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/omap4iss/Kconfig b/drivers/staging/media/omap4iss/Kconfig index 78b0fba7047e..8afc6fee40c5 100644 --- a/drivers/staging/media/omap4iss/Kconfig +++ b/drivers/staging/media/omap4iss/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config VIDEO_OMAP4 | 1 | config VIDEO_OMAP4 |
| 2 | bool "OMAP 4 Camera support" | 2 | bool "OMAP 4 Camera support" |
| 3 | depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && I2C && ARCH_OMAP4 | 3 | depends on VIDEO_V4L2=y && VIDEO_V4L2_SUBDEV_API && I2C=y && ARCH_OMAP4 |
| 4 | select VIDEOBUF2_DMA_CONTIG | 4 | select VIDEOBUF2_DMA_CONTIG |
| 5 | ---help--- | 5 | ---help--- |
| 6 | Driver for an OMAP 4 ISS controller. | 6 | Driver for an OMAP 4 ISS controller. |