2.6.0-t3.c99.arch.ia64-lkml.patch

   1 diff -aur linux.backup/arch/ia64/hp/common/sba_iommu.c linux/arch/ia64/hp/common/sba_iommu.c
   2 --- linux.backup/arch/ia64/hp/common/sba_iommu.c        Sat Aug 16 15:02:36 2003
   3 +++ linux/arch/ia64/hp/common/sba_iommu.c       Sat Aug 16 17:56:19 2003
   4 @@ -1935,10 +1935,10 @@
   5  }
   6
   7  static struct acpi_driver acpi_sba_ioc_driver = {
   8 -       name:           "IOC IOMMU Driver",
   9 -       ids:            "HWP0001,HWP0004",
  10 -       ops: {
  11 -               add:    acpi_sba_ioc_add,
  12 +       .name           = "IOC IOMMU Driver",
  13 +       .ids            = "HWP0001,HWP0004",
  14 +       .ops            = {
  15 +               .add    = acpi_sba_ioc_add,
  16         },
  17  };
  18
  19 diff -aur linux.backup/arch/ia64/kernel/perfmon.c linux/arch/ia64/kernel/perfmon.c
  20 --- linux.backup/arch/ia64/kernel/perfmon.c     Sat Aug 16 15:02:16 2003
  21 +++ linux/arch/ia64/kernel/perfmon.c    Sat Aug 16 15:44:59 2003
  22 @@ -2122,7 +2122,7 @@
  23         return 1;
  24  }
  25  static struct dentry_operations pfmfs_dentry_operations = {
  26 -       d_delete:       pfmfs_delete_dentry,
  27 +       .d_delete       = pfmfs_delete_dentry,
  28  };
  29
  30
  31 diff -aur linux.backup/arch/ia64/sn/io/drivers/ioconfig_bus.c linux/arch/ia64/sn/io/drivers/ioconfig_bus.c
  32 --- linux.backup/arch/ia64/sn/io/drivers/ioconfig_bus.c Thu Jun 26 23:48:30 2003
  33 +++ linux/arch/ia64/sn/io/drivers/ioconfig_bus.c        Sat Aug 16 17:57:14 2003
  34 @@ -346,9 +346,9 @@
  35  }
  36
  37  struct file_operations ioconfig_bus_fops = {
  38 -       ioctl:ioconfig_bus_ioctl,
  39 -       open:ioconfig_bus_open,         /* open */
  40 -       release:ioconfig_bus_close      /* release */
  41 +       .ioctl = ioconfig_bus_ioctl,
  42 +       .open = ioconfig_bus_open,              /* open */
  43 +       .release = ioconfig_bus_close   /* release */
  44  };
  45
  46
  47 diff -aur linux.backup/arch/ia64/sn/io/sn2/shub.c linux/arch/ia64/sn/io/sn2/shub.c
  48 --- linux.backup/arch/ia64/sn/io/sn2/shub.c     Sat Aug 16 15:02:37 2003
  49 +++ linux/arch/ia64/sn/io/sn2/shub.c    Sat Aug 16 15:45:00 2003
  50 @@ -243,7 +243,7 @@
  51  }
  52
  53  struct file_operations shub_mon_fops = {
  54 -               ioctl:          shubstats_ioctl,
  55 +               .ioctl          = shubstats_ioctl,
  56  };
  57
  58  /*
  59 diff -aur linux.backup/arch/ia64/sn/kernel/setup.c linux/arch/ia64/sn/kernel/setup.c
  60 --- linux.backup/arch/ia64/sn/kernel/setup.c    Sat Aug 16 15:02:37 2003
  61 +++ linux/arch/ia64/sn/kernel/setup.c   Sat Aug 16 17:57:36 2003
  62 @@ -117,14 +117,14 @@
  63   * VGA color display.
  64   */
  65  struct screen_info sn_screen_info = {
  66 -       orig_x:                  0,
  67 -       orig_y:                  0,
  68 -       orig_video_mode:         3,
  69 -       orig_video_cols:        80,
  70 -       orig_video_ega_bx:       3,
  71 -       orig_video_lines:       25,
  72 -       orig_video_isVGA:        1,
  73 -       orig_video_points:      16
  74 +       .orig_x                 = 0,
  75 +       .orig_y                 = 0,
  76 +       .orig_video_mode        = 3,
  77 +       .orig_video_cols        = 80,
  78 +       .orig_video_ega_bx      = 3,
  79 +       .orig_video_lines       = 25,
  80 +       .orig_video_isVGA       = 1,
  81 +       .orig_video_points      = 16
  82  };
  83
  84  /*