summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 12:47:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 12:47:53 -0700
commit478735e42bfa047384afa72dceb408035532db20 (patch)
treeede251ddac769e680422d32338e6e9d9de06b104
parent0ef89d25d3e390dfa7c46772907951744a4067dc (diff)
parent6f5fd8e9b98423add5f67b964e7cc8733dd73460 (diff)
downloadtalos-obmc-linux-478735e42bfa047384afa72dceb408035532db20.tar.gz
talos-obmc-linux-478735e42bfa047384afa72dceb408035532db20.zip
Merge branch 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6: drivers/media, include/media: delete zero-length files
-rw-r--r--drivers/media/video/planb.c0
-rw-r--r--drivers/media/video/planb.h0
-rw-r--r--drivers/media/video/saa7196.h0
-rw-r--r--drivers/media/video/videodev.c0
-rw-r--r--include/media/audiochip.h0
5 files changed, 0 insertions, 0 deletions
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
deleted file mode 100644
index e69de29bb2d1..000000000000
--- 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 e69de29bb2d1..000000000000
--- 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 e69de29bb2d1..000000000000
--- 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 e69de29bb2d1..000000000000
--- 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 e69de29bb2d1..000000000000
--- a/include/media/audiochip.h
+++ /dev/null
OpenPOWER on IntegriCloud