Changeset 1542

Show
Ignore:
Timestamp:
09/21/02 23:04:11 (6 years ago)
Author:
mds
Message:

add dmi_scan.o to export-objs (ticket 1002);

make all i2c drivers dep-tristate on $CONFIG_I2C so that
they are forced to modules if i2c-core is a module.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • lm-sensors/trunk/mkpatch/mkpatch.pl

    r1479 r1542  
    571571  close INPUT; 
    572572  close OUTPUT; 
    573   die "Automatic patch generation for `Makefile' failed.\n". 
     573  die "Automatic patch generation for main `Makefile' failed.\n". 
    574574      "See our home page http://www.lm-sensors.nu for assistance!" if $pr1 == 0; 
    575575  print_diff $package_root,$kernel_root,$kernel_file,$package_file; 
     
    688688  close INPUT; 
    689689  close OUTPUT; 
    690   die "Automatic patch generation for `drivers/Makefile' failed.\n". 
     690  die "Automatic patch generation for `drivers/char/Config.in' failed.\n". 
    691691      "See our home page http://www.lm-sensors.nu for assistance!" if $pr1 == 0; 
    692692  print_diff $package_root,$kernel_root,$kernel_file,$package_file; 
     
    786786  bool 'I2C mainboard interfaces' CONFIG_I2C_MAINBOARD  
    787787  if [ "$CONFIG_I2C_MAINBOARD" = "y" ]; then 
    788     tristate '  Acer Labs ALI 1535' CONFIG_I2C_ALI1535  
    789     tristate '  Acer Labs ALI 1533 and 1543C' CONFIG_I2C_ALI15X3  
     788    dep_tristate '  Acer Labs ALI 1535' CONFIG_I2C_ALI1535 $CONFIG_I2C 
     789    dep_tristate '  Acer Labs ALI 1533 and 1543C' CONFIG_I2C_ALI15X3 $CONFIG_I2C 
    790790    dep_tristate '  Apple Hydra Mac I/O' CONFIG_I2C_HYDRA $CONFIG_I2C_ALGOBIT 
    791     tristate '  AMD 756/766/768' CONFIG_I2C_AMD756 
     791    dep_tristate '  AMD 756/766/768' CONFIG_I2C_AMD756 $CONFIG_I2C 
    792792    dep_tristate '  DEC Tsunami I2C interface' CONFIG_I2C_TSUNAMI $CONFIG_I2C_ALGOBIT 
    793     tristate '  Intel 82801AA, AB, BA, DB' CONFIG_I2C_I801 
     793    dep_tristate '  Intel 82801AA, AB, BA, DB' CONFIG_I2C_I801 $CONFIG_I2C 
    794794    dep_tristate '  Intel i810AA/AB/E and i815' CONFIG_I2C_I810 $CONFIG_I2C_ALGOBIT 
    795     tristate '  Intel 82371AB PIIX4(E), 443MX, ServerWorks OSB4/CSB5, SMSC Victory66' CONFIG_I2C_PIIX4 
    796     tristate '  SiS 5595' CONFIG_I2C_SIS5595 
     795    dep_tristate '  Intel 82371AB PIIX4(E), 443MX, ServerWorks OSB4/CSB5, SMSC Victory66' CONFIG_I2C_PIIX4 $CONFIG_I2C 
     796    dep_tristate '  SiS 5595' CONFIG_I2C_SIS5595 $CONFIG_I2C 
    797797    dep_tristate '  Savage 4' CONFIG_I2C_SAVAGE4 $CONFIG_I2C_ALGOBIT 
    798798    dep_tristate '  VIA Technologies, Inc. VT82C586B' CONFIG_I2C_VIA $CONFIG_I2C_ALGOBIT 
    799     tristate '  VIA Technologies, Inc. VT596A/B, 686A/B, 8231, 8233, 8233A' CONFIG_I2C_VIAPRO 
     799    dep_tristate '  VIA Technologies, Inc. VT596A/B, 686A/B, 8231, 8233, 8233A' CONFIG_I2C_VIAPRO $CONFIG_I2C 
    800800    dep_tristate '  Voodoo3 I2C interface' CONFIG_I2C_VOODOO3 $CONFIG_I2C_ALGOBIT 
    801     tristate '  Pseudo ISA adapter (for some hardware sensors)' CONFIG_I2C_ISA  
     801    dep_tristate '  Pseudo ISA adapter (for some hardware sensors)' CONFIG_I2C_ISA $CONFIG_I2C 
    802802  fi 
    803803 
     
    11701170obj-$(CONFIG_I2C_VIAPRO)                += i2c-viapro.o 
    11711171obj-$(CONFIG_I2C_VOODOO3)               += i2c-voodoo3.o 
     1172export-objs                             += dmi_scan.o 
    11721173EOF 
    11731174      } else {