diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-15 17:22:21 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-15 17:22:21 (GMT) |
commit | 04ab591808565f968d4406f6435090ad671ebdab (patch) | |
tree | 60aebaba3ae0911641ce18c6f04a361a278bc60a /include/linux | |
parent | 7c3b1dcf13d5660152e02c6dea47b0bd9fd5d871 (diff) | |
parent | 08da6f1bdddca14ba0fe28a5f6c41aa163aa27d3 (diff) | |
download | linux-fsl-qoriq-04ab591808565f968d4406f6435090ad671ebdab.tar.xz |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Kill unused <asm/debug.h> inclusions
MIPS: IP32: Add platform device for CMOS RTC; remove dead code
RTC: M48T35: new RTC driver
MIPS: IP27: Switch over to RTC class driver
MIPS: DS1286: New RTC driver
MIPS: IP22/28: Switch over to RTC class driver
MIPS: PCI: Scan busses when they are registered
MIPS: WGT634U: Add reset button support
MIPS: BCM47xx: Use the new SSB GPIO API
MIPS: BCM47xx: Remove references to BCM947XX
MIPS: WGT634U: Add machine detection message
MIPS: Align .data.cacheline_aligned based on CONFIG_MIPS_L1_CACHE_SHIFT
MIPS: show_cpuinfo prints the type of the calling CPU
MIPS: Fix wrong branch target in new spin_lock code.
MIPS: Have a heart for a lonely, lost header file ...
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ds1286.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/ds1286.h b/include/linux/ds1286.h index d898986..45ea0aa 100644 --- a/include/linux/ds1286.h +++ b/include/linux/ds1286.h @@ -8,8 +8,6 @@ #ifndef __LINUX_DS1286_H #define __LINUX_DS1286_H -#include <asm/ds1286.h> - /********************************************************************** * register summary **********************************************************************/ |