diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 18:14:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 18:14:55 -0700 |
commit | a44f99c7efdb88fa41128065c9a9445c19894e34 (patch) | |
tree | 9d9dc6026b2c0409eca05e360c98b8a688ccdb1e /drivers/ide/Makefile | |
parent | b87a2d3e3147bd140da2eae584772c353d11421b (diff) | |
parent | 22942c00a6ad6e9e93b53811a6de72c821c15d22 (diff) | |
download | linux-a44f99c7efdb88fa41128065c9a9445c19894e34.tar.gz linux-a44f99c7efdb88fa41128065c9a9445c19894e34.tar.bz2 linux-a44f99c7efdb88fa41128065c9a9445c19894e34.zip |
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
video: change to new flag variable
scsi: change to new flag variable
rtc: change to new flag variable
rapidio: change to new flag variable
pps: change to new flag variable
net: change to new flag variable
misc: change to new flag variable
message: change to new flag variable
memstick: change to new flag variable
isdn: change to new flag variable
ieee802154: change to new flag variable
ide: change to new flag variable
hwmon: change to new flag variable
dma: change to new flag variable
char: change to new flag variable
fs: change to new flag variable
xtensa: change to new flag variable
um: change to new flag variables
s390: change to new flag variable
mips: change to new flag variable
...
Fix up trivial conflict in drivers/hwmon/Makefile
Diffstat (limited to 'drivers/ide/Makefile')
-rw-r--r-- | drivers/ide/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile index 81df925f0e8b..7f879b2397b0 100644 --- a/drivers/ide/Makefile +++ b/drivers/ide/Makefile @@ -2,7 +2,7 @@ # link order is important here # -EXTRA_CFLAGS += -Idrivers/ide +ccflags-y := -Idrivers/ide ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \ ide-taskfile.o ide-pm.o ide-park.o ide-sysfs.o ide-devsets.o \ |