Index: /lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect
===================================================================
--- /lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect	(revision 5590)
+++ /lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect	(revision 5591)
@@ -5056,5 +5056,5 @@
 	my ($driver, $detection, $adap);
 	my ($isa, $ipmi);
-	my ($modprobes, $configfile, %bus_modules, %hwmon_modules);
+	my ($configfile, %bus_modules, %hwmon_modules);
 
 	foreach $driver (keys %chips_detected) {
@@ -5105,7 +5105,4 @@
 		next unless loaded_by_us($adap->{driver});
 		next if not defined $configfile and not $adap->{used};
-		$modprobes .= "# I2C adapter drivers\n" unless defined $modprobes;
-		$modprobes .= "modprobe $adap->{driver}\n"
-			unless exists $bus_modules{$adap->{driver}};
 		$bus_modules{$adap->{driver}}++;
 	}
@@ -5114,14 +5111,11 @@
 	# and will soon be gone.
 	if ($isa && !kernel_version_at_least(2, 6, 18)) {
-		$modprobes .= "modprobe i2c-isa\n";
 		$bus_modules{"i2c-isa"}++;
 	}
 	if ($ipmi) {
-		$modprobes .= "modprobe ipmi-si\n";
 		$bus_modules{"ipmi-si"}++;
 	}
 
 	# Now determine the chip probe lines
-	$modprobes .= "# Chip drivers\n";
 	foreach $driver (keys %chips_detected) {
 		next if not @{$chips_detected{$driver}};
@@ -5148,5 +5142,4 @@
 				      "driver availability.\n\n";
 			} else {
-				$modprobes .= "modprobe $driver\n";
 				$hwmon_modules{$driver}++;
 			}
@@ -5156,10 +5149,10 @@
 	my @bus_modules = sort keys %bus_modules;
 	my @hwmon_modules = sort keys %hwmon_modules;
-	return ($modprobes, $configfile, \@bus_modules, \@hwmon_modules);
+	return ($configfile, \@bus_modules, \@hwmon_modules);
 }
 
 sub write_config
 {
-	my ($modprobes, $configfile, $bus_modules, $hwmon_modules) = @_;
+	my ($configfile, $bus_modules, $hwmon_modules) = @_;
 
 	if (defined $configfile) {
@@ -5246,10 +5239,15 @@
 		print "To load everything that is needed, add this to one of the system\n".
 		      "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
-		print "#----cut here----\n".
-		      $modprobes.
-		      (-e '/usr/bin/sensors' ?
+		print "#----cut here----\n";
+		if (@{$bus_modules}) {
+			print "# Adapter drivers\n";
+			print "modprobe $_\n" foreach (@{$bus_modules});
+		}
+		print "# Chip drivers\n";
+		print "modprobe $_\n" foreach (@{$hwmon_modules});
+		print((-e '/usr/bin/sensors' ?
 		       "/usr/bin/sensors -s\n" :
 		       "/usr/local/bin/sensors -s\n").
-		      "#----cut here----\n\n";
+		      "#----cut here----\n\n");
 
 		print "If you have some drivers built into your kernel, the list above will\n".
@@ -5409,8 +5407,8 @@
 	print "\n";
 
-	my ($modprobes, $configfile, $bus_modules, $hwmon_modules) = generate_modprobes();
+	my ($configfile, $bus_modules, $hwmon_modules) = generate_modprobes();
 
 	if (@{$hwmon_modules}) {
-		write_config($modprobes, $configfile, $bus_modules, $hwmon_modules);
+		write_config($configfile, $bus_modules, $hwmon_modules);
 	} else {
 		print "No modules to load, skipping modules configuration.\n\n";