Skip to content

Commit

Permalink
Merge branch 'for-linux-next' of git://linux-c6x.org/git/projects/lin…
Browse files Browse the repository at this point in the history
…ux-c6x-upstreaming

Pull tiny c6x update from Mark Salter.

* 'for-linux-next' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: Use generic clkdev.h header
  • Loading branch information
Linus Torvalds committed Jan 12, 2016
2 parents c3ce79d + ca3060d commit 75777c1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
1 change: 1 addition & 0 deletions arch/c6x/include/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ generic-y += auxvec.h
generic-y += barrier.h
generic-y += bitsperlong.h
generic-y += bugs.h
generic-y += clkdev.h
generic-y += cputime.h
generic-y += current.h
generic-y += device.h
Expand Down
22 changes: 0 additions & 22 deletions arch/c6x/include/asm/clkdev.h

This file was deleted.

0 comments on commit 75777c1

Please sign in to comment.