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.

27 lines
709 B

  1. --- ./kernel/svgalib_helper/kernel26compat.h.orig 2003-10-04 16:42:01.000000000 +0300
  2. +++ ./kernel/svgalib_helper/kernel26compat.h 2004-04-17 15:04:45.000000000 +0300
  3. @@ -9,9 +9,12 @@
  4. # define my_io_remap_page_range(vma, start, ofs, len, prot) io_remap_page_range(start,ofs,len,prot)
  5. +#ifndef IRQ_NONE
  6. +/* The newest 2.4 kernels define these ... */
  7. typedef void irqreturn_t;
  8. # define IRQ_NONE
  9. # define IRQ_HANDLED
  10. +#endif
  11. #else /* Kernel 2.6 */
  12. @@ -44,10 +47,5 @@
  13. #endif
  14. -/* Our main.c really do not like MINOR from 2.6 kernels ... */
  15. -#if (defined MINOR) && (!defined KERNEL_2_6)
  16. -# define my_minor(x) MINOR(x)
  17. -#else
  18. -# define my_minor(x) minor(x)
  19. -#endif
  20. +#define my_minor(x) MINOR(x)