mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

52 lines
1.6 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/linux/linux26/77-mc146818rtc_h.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- linux-2.6.12.3/include/asm-i386/mc146818rtc.h
  20. +++ linux-2.6.12.3/include/asm-i386/mc146818rtc.h
  21. @@ -5,14 +5,21 @@
  22. #define _ASM_MC146818RTC_H
  23. #include <asm/io.h>
  24. +
  25. +#ifdef __KERNEL__
  26. +
  27. #include <asm/system.h>
  28. #include <linux/mc146818rtc.h>
  29. +#endif /* __KERNEL__ */
  30. +
  31. #ifndef RTC_PORT
  32. #define RTC_PORT(x) (0x70 + (x))
  33. #define RTC_ALWAYS_BCD 1 /* RTC operates in binary mode */
  34. #endif
  35. +#ifdef __KERNEL__
  36. +
  37. #ifdef __HAVE_ARCH_CMPXCHG
  38. /*
  39. * This lock provides nmi access to the CMOS/RTC registers. It has some
  40. @@ -80,6 +87,8 @@
  41. #define current_lock_cmos_reg() 0
  42. #endif
  43. +#endif /* __KERNEL__ */
  44. +
  45. /*
  46. * The yet supported machines all access the RTC index register via
  47. * an ISA port access but the way to access the date register differs ...