diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 21:14:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 21:14:55 -0400 |
| commit | a44f99c7efdb88fa41128065c9a9445c19894e34 (patch) | |
| tree | 9d9dc6026b2c0409eca05e360c98b8a688ccdb1e /drivers/net/wan | |
| parent | b87a2d3e3147bd140da2eae584772c353d11421b (diff) | |
| parent | 22942c00a6ad6e9e93b53811a6de72c821c15d22 (diff) | |
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/net/wan')
| -rw-r--r-- | drivers/net/wan/lmc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/lmc/Makefile b/drivers/net/wan/lmc/Makefile index dabdcfed4efd..609710d64eb5 100644 --- a/drivers/net/wan/lmc/Makefile +++ b/drivers/net/wan/lmc/Makefile | |||
| @@ -14,4 +14,4 @@ lmc-objs := lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o | |||
| 14 | # -DDEBUG \ | 14 | # -DDEBUG \ |
| 15 | # -DLMC_PACKET_LOG | 15 | # -DLMC_PACKET_LOG |
| 16 | 16 | ||
| 17 | EXTRA_CFLAGS += -I. $(DBGDEF) | 17 | ccflags-y := -I. $(DBGDEF) |