diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
| commit | cf9b59e9d3e008591d1f54830f570982bb307a0d (patch) | |
| tree | 113478ce8fd8c832ba726ffdf59b82cb46356476 /drivers/char/Makefile | |
| parent | 44504b2bebf8b5823c59484e73096a7d6574471d (diff) | |
| parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) | |
Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.
Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c
Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/char/Makefile')
| -rw-r--r-- | drivers/char/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index f957edf7e45d..d39be4cf1f5d 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile | |||
| @@ -40,6 +40,7 @@ obj-$(CONFIG_SYNCLINK) += synclink.o | |||
| 40 | obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o | 40 | obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o |
| 41 | obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o | 41 | obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o |
| 42 | obj-$(CONFIG_N_HDLC) += n_hdlc.o | 42 | obj-$(CONFIG_N_HDLC) += n_hdlc.o |
| 43 | obj-$(CONFIG_N_GSM) += n_gsm.o | ||
| 43 | obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o | 44 | obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o |
| 44 | obj-$(CONFIG_SX) += sx.o generic_serial.o | 45 | obj-$(CONFIG_SX) += sx.o generic_serial.o |
| 45 | obj-$(CONFIG_RIO) += rio/ generic_serial.o | 46 | obj-$(CONFIG_RIO) += rio/ generic_serial.o |