summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2012-07-01 15:46:56 +0200
committerJiri Kosina <jkosina@suse.cz>2012-09-01 08:36:09 -0700
commit19feb61e9956270e1be47250ace881ebbe130b8e (patch)
tree1852ac8212a3954c0f6a0a1ee085fa1b303ff577
parentec2e1ed2d7f703ee5dfc9bff501bf0ccb70ab23b (diff)
downloadlinux-19feb61e9956270e1be47250ace881ebbe130b8e.tar.bz2
oss: remove maui_boot.h from .gitignore and dontdiff
Commit d56b9b9c464a10ab1ee51a4c6190a2b57b8ef7a6 ("The scheduled removal of some OSS drivers") removed all traces of maui_boot.h from the tree. Remove its entries in dontdiff and oss's .gitignore file. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--Documentation/dontdiff1
-rw-r--r--sound/oss/.gitignore1
2 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index b4a898f43c37..3af5ad473858 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -163,7 +163,6 @@ mach-types.h
machtypes.h
map
map_hugetlb
-maui_boot.h
media
mconf
miboot*
diff --git a/sound/oss/.gitignore b/sound/oss/.gitignore
index 7efb12b45502..12a3920d6fb6 100644
--- a/sound/oss/.gitignore
+++ b/sound/oss/.gitignore
@@ -1,4 +1,3 @@
#Ignore generated files
-maui_boot.h
pss_boot.h
trix_boot.h