Merge branch 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6

478735e4 · Linus Torvalds <[email protected]> · 2008-08-01 12:47:53 -07:00

* 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  drivers/media, include/media: delete zero-length files

Merge commit. Changes below are compared with the first parent: 0ef89d25.

Changes

5 files changed · +0 −0

File	Status	Add	Del	Content
drivers/media/video/planb.c	deleted	+0	−0	View before deletion
drivers/media/video/planb.h	deleted	+0	−0	View before deletion
drivers/media/video/saa7196.h	deleted	+0	−0	View before deletion
drivers/media/video/videodev.c	deleted	+0	−0	View before deletion
include/media/audiochip.h	deleted	+0	−0	View before deletion

diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
deleted file mode 100644
index e69de29..0000000
--- a/drivers/media/video/planb.c
+++ /dev/null

diff --git a/drivers/media/video/planb.h b/drivers/media/video/planb.h
deleted file mode 100644
index e69de29..0000000
--- a/drivers/media/video/planb.h
+++ /dev/null

diff --git a/drivers/media/video/saa7196.h b/drivers/media/video/saa7196.h
deleted file mode 100644
index e69de29..0000000
--- a/drivers/media/video/saa7196.h
+++ /dev/null

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
deleted file mode 100644
index e69de29..0000000
--- a/drivers/media/video/videodev.c
+++ /dev/null

diff --git a/include/media/audiochip.h b/include/media/audiochip.h
deleted file mode 100644
index e69de29..0000000
--- a/include/media/audiochip.h
+++ /dev/null