diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/sparc/include/asm/Kbuild | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/sparc/include/asm/Kbuild')
| -rw-r--r-- | arch/sparc/include/asm/Kbuild | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild index 3f1cb7ad0d67..2d2769d766ec 100644 --- a/arch/sparc/include/asm/Kbuild +++ b/arch/sparc/include/asm/Kbuild | |||
| @@ -20,7 +20,6 @@ header-y += unistd_64.h | |||
| 20 | 20 | ||
| 21 | header-y += apc.h | 21 | header-y += apc.h |
| 22 | header-y += asi.h | 22 | header-y += asi.h |
| 23 | header-y += bpp.h | ||
| 24 | header-y += display7seg.h | 23 | header-y += display7seg.h |
| 25 | header-y += envctrl.h | 24 | header-y += envctrl.h |
| 26 | header-y += fbio.h | 25 | header-y += fbio.h |
| @@ -39,5 +38,4 @@ header-y += reg_64.h | |||
| 39 | header-y += traps.h | 38 | header-y += traps.h |
| 40 | header-y += uctx.h | 39 | header-y += uctx.h |
| 41 | header-y += utrap.h | 40 | header-y += utrap.h |
| 42 | header-y += vfc_ioctls.h | ||
| 43 | header-y += watchdog.h | 41 | header-y += watchdog.h |