diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:48 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:55 -0400 |
| commit | b7e9c223be8ce335e30f2cf6ba588e6a4092275c (patch) | |
| tree | 2d1e3b75606abc18df7ad65e51ac3f90cd68b38d /arch/powerpc/configs/pseries_defconfig | |
| parent | c172d82500a6cf3c32d1e650722a1055d72ce858 (diff) | |
| parent | e3bbfa78bab125f58b831b5f7f45b5a305091d72 (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
Diffstat (limited to 'arch/powerpc/configs/pseries_defconfig')
| -rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index c9f212b5f3d..80bc5de7ee1 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
| @@ -148,7 +148,6 @@ CONFIG_SCSI_SAS_ATTRS=m | |||
| 148 | CONFIG_SCSI_CXGB3_ISCSI=m | 148 | CONFIG_SCSI_CXGB3_ISCSI=m |
| 149 | CONFIG_SCSI_CXGB4_ISCSI=m | 149 | CONFIG_SCSI_CXGB4_ISCSI=m |
| 150 | CONFIG_SCSI_BNX2_ISCSI=m | 150 | CONFIG_SCSI_BNX2_ISCSI=m |
| 151 | CONFIG_SCSI_BNX2_ISCSI=m | ||
| 152 | CONFIG_BE2ISCSI=m | 151 | CONFIG_BE2ISCSI=m |
| 153 | CONFIG_SCSI_IBMVSCSI=y | 152 | CONFIG_SCSI_IBMVSCSI=y |
| 154 | CONFIG_SCSI_IBMVFC=m | 153 | CONFIG_SCSI_IBMVFC=m |