summaryrefslogtreecommitdiff
path: root/patches/backport-adjustments
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-04-08 21:11:45 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-04-08 21:14:07 +0200
commited8535368dfb2e92077126eba1e78ee57f89448c (patch)
tree78c88e568bfdfd51f24fa4f2e3e385b62b22eb06 /patches/backport-adjustments
parent35d1b56e93e192c926c866f2f69123bddccc0826 (diff)
gentree: make automatic backport filenames unique
Instead of copying drivers/base/hdmi.c to just hdmi.c copy it to drivers-base-hdmi.c as there can be multiple files with the same name (e.g. "core.c"). While at it, also fix this mechanism for modules -- before having more than a single file for a module would have caused multiple modules which clearly can't work, now it's needed to give a #module-name and it will be added to the Makefile correctly. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/backport-adjustments')
-rw-r--r--patches/backport-adjustments/dma-buf.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/backport-adjustments/dma-buf.patch b/patches/backport-adjustments/dma-buf.patch
index cec56269..06ed9f65 100644
--- a/patches/backport-adjustments/dma-buf.patch
+++ b/patches/backport-adjustments/dma-buf.patch
@@ -1,5 +1,5 @@
---- a/compat/dma-buf.c
-+++ b/compat/dma-buf.c
+--- a/compat/drivers-base-dma-buf.c
++++ b/compat/drivers-base-dma-buf.c
@@ -27,6 +27,9 @@
#include <linux/dma-buf.h>
#include <linux/anon_inodes.h>