package/ifx-vmmc/patches-2.6.33/001-portability.patch

   1 --- a/src/Makefile.am
   2 +++ b/src/Makefile.am
   3 @@ -227,7 +227,7 @@ drv_vmmc_CFLAGS += -fno-common
   4  drv_vmmc_OBJS = "$(subst .c,.o, $(drv_vmmc_SOURCES) $(nodist_drv_vmmc_SOURCES))"
   5
   6  drv_vmmc.ko: $(drv_vmmc_SOURCES) $(EXTRA_DIST)
   7 -       @echo -e "Making Linux 2.6.x kernel object"
   8 +       @echo "Making Linux 2.6.x kernel object"
   9         @for f in $(drv_vmmc_SOURCES) $(nodist_drv_vmmc_SOURCES) ; do \
  10                 if test ! -e $(PWD)/$$f; then \
  11                         echo "  LN      $$f" ; \
  12 @@ -235,10 +235,10 @@ drv_vmmc.ko: $(drv_vmmc_SOURCES) $(EXTRA
  13                         ln -s @abs_srcdir@/$$f $(PWD)/$$f; \
  14                 fi; \
  15         done;
  16 -       @echo -e "# drv_vmmc: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
  17 -       @echo -e "obj-m := $(subst .ko,.o,$@)"                  >> $(PWD)/Kbuild
  18 -       @echo -e "$(subst .ko,,$@)-y := $(drv_vmmc_OBJS)"       >> $(PWD)/Kbuild
  19 -       @echo -e "EXTRA_CFLAGS := -DHAVE_CONFIG_H  $(CFLAGS) $(drv_vmmc_CFLAGS) $(INCLUDES)"    >> $(PWD)/Kbuild
  20 +       @echo "# drv_vmmc: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
  21 +       @echo "obj-m := $(subst .ko,.o,$@)"                     >> $(PWD)/Kbuild
  22 +       @echo "$(subst .ko,,$@)-y := $(drv_vmmc_OBJS)"  >> $(PWD)/Kbuild
  23 +       @echo "EXTRA_CFLAGS := -DHAVE_CONFIG_H  $(CFLAGS) $(drv_vmmc_CFLAGS) $(INCLUDES)"       >> $(PWD)/Kbuild
  24         $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules
  25
  26  clean-generic:
  27 --- a/src/drv_vmmc_linux.c
  28 +++ b/src/drv_vmmc_linux.c
  29 @@ -27,11 +27,12 @@
  30  #include <linux/proc_fs.h>
  31  #include <linux/wait.h>
  32  #include <linux/vmalloc.h>
  33 +#include <linux/sched.h>
  34
  35  #ifdef LINUX_2_6
  36  #include <linux/version.h>
  37  #ifndef UTS_RELEASE
  38 -#include <linux/utsrelease.h>
  39 +#include <generated/utsrelease.h>
  40  #endif /* UTC_RELEASE */
  41  #undef CONFIG_DEVFS_FS
  42  #endif /* LINUX_2_6 */
  43 --- a/src/mps/drv_mps_vmmc_linux.c
  44 +++ b/src/mps/drv_mps_vmmc_linux.c
  45 @@ -23,7 +23,7 @@
  46  #ifdef CONFIG_DEBUG_MINI_BOOT
  47  #define IKOS_MINI_BOOT
  48  #endif /* */
  49 -#include <linux/autoconf.h>
  50 +#include <generated/autoconf.h>
  51  #include <linux/module.h>
  52  #include <linux/init.h>
  53  #include <linux/poll.h>
  54 @@ -34,7 +34,7 @@
  55  #include <linux/delay.h>
  56  #include <linux/interrupt.h>
  57  #ifdef LINUX_2_6
  58 -#include <linux/utsrelease.h>
  59 +#include <generated/utsrelease.h>
  60  #else /* */
  61  #include <linux/uts.h>
  62  #include <linux/moduleparam.h>
  63 --- a/src/mps/drv_mps_vmmc_common.c
  64 +++ b/src/mps/drv_mps_vmmc_common.c
  65 @@ -21,7 +21,7 @@
  66  #undef USE_PLAIN_VOICE_FIRMWARE
  67  #undef PRINT_ON_ERR_INTERRUPT
  68  #undef FAIL_ON_ERR_INTERRUPT
  69 -#include <linux/autoconf.h>
  70 +#include <generated/autoconf.h>
  71  #include <linux/interrupt.h>
  72  #include <linux/delay.h>
  73
  74 --- a/src/mps/drv_mps_vmmc_danube.c
  75 +++ b/src/mps/drv_mps_vmmc_danube.c
  76 @@ -20,7 +20,7 @@
  77
  78  #ifdef SYSTEM_DANUBE            /* defined in drv_mps_vmmc_config.h */
  79
  80 -#include <linux/autoconf.h>
  81 +#include <generated/autoconf.h>
  82
  83  /* lib_ifxos headers */
  84  #include "ifx_types.h"
  85 --- a/configure.in
  86 +++ b/configure.in
  87 @@ -112,7 +112,7 @@ dnl Set kernel build path
  88  AC_ARG_ENABLE(kernelbuild,
  89          AS_HELP_STRING(--enable-kernelbuild=x,Set the target kernel build path),
  90          [
  91 -                if test -r $enableval/include/linux/autoconf.h; then
  92 +                if test -e $enableval/include/linux/autoconf.h -o -e $enableval/include/generated/autoconf.h; then
  93                          AC_SUBST([KERNEL_BUILD_PATH],[$enableval])
  94                  else
  95                          AC_MSG_ERROR([The kernel build directory is not valid or not configured!])