diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-21 21:36:40 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-21 21:37:09 +0100 |
| commit | d97a860c4f3de98ba5040a22f305b7159fe17cff (patch) | |
| tree | 90c2155ec5a1f3115a9eb7a86f25d1a4610227c6 /drivers/net/can/flexcan.c | |
| parent | 3f67d962c64d9b6de9dab81bdbe6d5c94c80d9b9 (diff) | |
| parent | d158fc7f36a25e19791d25a55da5623399a2644f (diff) | |
| download | talos-obmc-linux-d97a860c4f3de98ba5040a22f305b7159fe17cff.tar.gz talos-obmc-linux-d97a860c4f3de98ba5040a22f305b7159fe17cff.zip | |
Merge branch 'linus' into sched/core
Reason: Bring bakc upstream modification to resolve conflicts
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/net/can/flexcan.c')
| -rw-r--r-- | drivers/net/can/flexcan.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index aaed97bee471..320bef2dba42 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -235,9 +235,12 @@ static const struct can_bittiming_const flexcan_bittiming_const = { }; /* - * Abstract off the read/write for arm versus ppc. + * Abstract off the read/write for arm versus ppc. This + * assumes that PPC uses big-endian registers and everything + * else uses little-endian registers, independent of CPU + * endianess. */ -#if defined(__BIG_ENDIAN) +#if defined(CONFIG_PPC) static inline u32 flexcan_read(void __iomem *addr) { return in_be32(addr); |
