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/char | |
| 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/char')
| -rw-r--r-- | drivers/char/mwave/Makefile | 4 | ||||
| -rw-r--r-- | drivers/char/mwave/README | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/mwave/Makefile b/drivers/char/mwave/Makefile index 26b4fce217b6..efa6a82e543d 100644 --- a/drivers/char/mwave/Makefile +++ b/drivers/char/mwave/Makefile | |||
| @@ -9,7 +9,7 @@ obj-$(CONFIG_MWAVE) += mwave.o | |||
| 9 | mwave-y := mwavedd.o smapi.o tp3780i.o 3780i.o | 9 | mwave-y := mwavedd.o smapi.o tp3780i.o 3780i.o |
| 10 | 10 | ||
| 11 | # To have the mwave driver disable other uarts if necessary | 11 | # To have the mwave driver disable other uarts if necessary |
| 12 | # EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES | 12 | # ccflags-y := -DMWAVE_FUTZ_WITH_OTHER_DEVICES |
| 13 | 13 | ||
| 14 | # To compile in lots (~20 KiB) of run-time enablable printk()s for debugging: | 14 | # To compile in lots (~20 KiB) of run-time enablable printk()s for debugging: |
| 15 | ccflags-y := -DMW_TRACE | 15 | ccflags-y += -DMW_TRACE |
diff --git a/drivers/char/mwave/README b/drivers/char/mwave/README index 480251fc78e2..c2a58f428bc8 100644 --- a/drivers/char/mwave/README +++ b/drivers/char/mwave/README | |||
| @@ -11,7 +11,7 @@ are not saved by the BIOS and so do not persist after unload and reload. | |||
| 11 | 0x0008 tp3780i tracing | 11 | 0x0008 tp3780i tracing |
| 12 | 12 | ||
| 13 | Tracing only occurs if the driver has been compiled with the | 13 | Tracing only occurs if the driver has been compiled with the |
| 14 | MW_TRACE macro #defined (i.e. let EXTRA_CFLAGS += -DMW_TRACE | 14 | MW_TRACE macro #defined (i.e. let ccflags-y := -DMW_TRACE |
| 15 | in the Makefile). | 15 | in the Makefile). |
| 16 | 16 | ||
| 17 | mwave_3780i_irq=5/7/10/11/15 | 17 | mwave_3780i_irq=5/7/10/11/15 |