diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /include/asm-mips/mc146818rtc.h | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'include/asm-mips/mc146818rtc.h')
| -rw-r--r-- | include/asm-mips/mc146818rtc.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/asm-mips/mc146818rtc.h b/include/asm-mips/mc146818rtc.h deleted file mode 100644 index 68b4da6d520b..000000000000 --- a/include/asm-mips/mc146818rtc.h +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * This file is subject to the terms and conditions of the GNU General Public | ||
| 3 | * License. See the file "COPYING" in the main directory of this archive | ||
| 4 | * for more details. | ||
| 5 | * | ||
| 6 | * Machine dependent access functions for RTC registers. | ||
| 7 | * | ||
| 8 | * Copyright (C) 1996, 1997, 1998, 2000 Ralf Baechle | ||
| 9 | * Copyright (C) 2002 Maciej W. Rozycki | ||
| 10 | */ | ||
| 11 | #ifndef _ASM_MC146818RTC_H | ||
| 12 | #define _ASM_MC146818RTC_H | ||
| 13 | |||
| 14 | #include <mc146818rtc.h> | ||
| 15 | |||
| 16 | #endif /* _ASM_MC146818RTC_H */ | ||