diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 09:59:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 09:59:27 -0700 |
| commit | df42654e90b3045691f4c327075897aed9691ebe (patch) | |
| tree | 559c78829b5fe291566e680d9fb2495accf29b54 /include/asm-arm/.gitignore | |
| parent | Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev (diff) | |
| download | linux-dev-df42654e90b3045691f4c327075897aed9691ebe.tar.xz linux-dev-df42654e90b3045691f4c327075897aed9691ebe.zip | |
Get rid of final remnants of include/asm-$(ARCH)
This renames include/asm-h8300/timer.h into arch/h8300/include/asm: it
was left over just because that file had been created in the -mm tree
before the whole h8300 header subdirectory had been moved, and then got
merged in the old location afterwards.
(See commits e0b0f9e4ead2468f84c26332ec42b118e76af572: "h8300: update
timer handler - new files" and 758db3f2118703a1e36374dae5d58bed963e7e0d:
"[h8300] move include/asm-h8300 to arch/h8300/include/asm" for details).
This also removes a left-over .gitignore file in include/asm-arm that
became stale when the ARM header files were moved (which happened in
multiple commits, just see "git log -- include/asm-arm" for details).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | include/asm-arm/.gitignore | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-arm/.gitignore b/include/asm-arm/.gitignore deleted file mode 100644 index e02c15d158fc..000000000000 --- a/include/asm-arm/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -arch -mach-types.h |