Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 331014
b: refs/heads/master
c: 2e59d4d
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Sep 15, 2012
1 parent 0cb1cc4 commit 9377916
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ebf6b78ebbc4877d80e6d7046301dfe4dbb2ac10
refs/heads/master: 2e59d4d14355ed615f80c763850c9913dfaa30d7
1 change: 0 additions & 1 deletion trunk/drivers/media/platform/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ config VIDEO_MX2_EMMAPRP
config VIDEO_SAMSUNG_EXYNOS_GSC
tristate "Samsung Exynos G-Scaler driver"
depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_EXYNOS5
depends on BROKEN
select VIDEOBUF2_DMA_CONTIG
select V4L2_MEM2MEM_DEV
help
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/media/platform/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV) += s5p-tv/

obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/

# FIXME!!! This driver is broken, as there's no makefile there!
#obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/
obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/

obj-$(CONFIG_BLACKFIN) += blackfin/

Expand Down

0 comments on commit 9377916

Please sign in to comment.