diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-27 18:08:42 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-27 18:08:42 (GMT) |
| commit | 30de83a00d4e801741cd974fa6a75c77b3a579e6 (patch) | |
| tree | 14f946098722c4cf5f7f5abe8302309c5d333164 /net/ax25/ax25_dev.c | |
| parent | fe2d2c208d3cdde37852bdc2f82788134d99de85 (diff) | |
| parent | 3fd33497f80aa528ded0db2851b48638635d5caa (diff) | |
| download | linux-fsl-qoriq-30de83a00d4e801741cd974fa6a75c77b3a579e6.tar.xz | |
Merge branch 'fixes-for-3.9' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
here's a patch series for net for the v3.9 release cycle. Fengguang Wu found
two problems with the sja1000 drivers:
A macro in the SH architecture collides with one in the sja1000 driver. I
created a minimal patch suited for stable, only changing this particular
define. (Once net is merged back to net-next, I'll post a patch to uniformly
use a SJA1000_ prefix for the sja100 private defines.) If you prefer, I can
squash both patches together.
Fengguang further noticed that the peak pcmcia driver will not compile on archs
without ioport support. I created a patch to limit the driver to archs which
select HAS_IOPORT in Kconfig.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ax25/ax25_dev.c')
0 files changed, 0 insertions, 0 deletions