2.6.0-t8-siimage-lkml.patch

   1 # This is a BitKeeper generated patch for the following project:
   2 # Project Name: Linux kernel tree
   3 # This patch format is intended for GNU patch command version 2.5 or higher.
   4 # This patch includes the following deltas:
   5 #                  ChangeSet    1.1346  -> 1.1347
   6 #       drivers/ide/pci/siimage.c       1.16    -> 1.17
   7 #
   8 # The following is the BitKeeper ChangeSet Log
   9 # --------------------------------------------
  10 # 03/10/16      noah@caltech.edu        1.1347
  11 # Make several functions in drivers/ide/pci/siimage.c compile regardless
  12 # of CONFIG_PROC_FS.  They are generally applicable, and leaving them out
  13 # prevents building the driver without CONFIG_PROC_FS.
  14 # --------------------------------------------
  15 #
  16 diff -Nru a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
  17 --- a/drivers/ide/pci/siimage.c Thu Oct 16 19:44:07 2003
  18 +++ b/drivers/ide/pci/siimage.c Thu Oct 16 19:44:07 2003
  19 @@ -35,13 +35,13 @@
  20  #include "siimage.h"
  21
  22  #if defined(DISPLAY_SIIMAGE_TIMINGS) && defined(CONFIG_PROC_FS)
  23 -#include <linux/stat.h>
  24  #include <linux/proc_fs.h>
  25
  26  static u8 siimage_proc = 0;
  27  #define SIIMAGE_MAX_DEVS               16
  28  static struct pci_dev *siimage_devs[SIIMAGE_MAX_DEVS];
  29  static int n_siimage_devs;
  30 +#endif /* defined(DISPLAY_SIIMAGE_TIMINGS) && defined(CONFIG_PROC_FS) */
  31
  32  /**
  33   *     pdev_is_sata            -       check if device is SATA
  34 @@ -120,6 +120,8 @@
  35         base |= drive->select.b.unit << drive->select.b.unit;
  36         return base;
  37  }
  38 +
  39 +#if defined(DISPLAY_SIIMAGE_TIMINGS) && defined(CONFIG_PROC_FS)
  40
  41  /**
  42   *     print_siimage_get_info  -       print minimal proc information