diff options
Diffstat (limited to 'drivers/net/can/flexcan.c')
-rw-r--r-- | drivers/net/can/flexcan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 81324a11a50f..1b6f5621ce89 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c | |||
@@ -192,7 +192,7 @@ struct flexcan_priv { | |||
192 | 192 | ||
193 | struct clk *clk; | 193 | struct clk *clk; |
194 | struct flexcan_platform_data *pdata; | 194 | struct flexcan_platform_data *pdata; |
195 | struct flexcan_devtype_data *devtype_data; | 195 | const struct flexcan_devtype_data *devtype_data; |
196 | }; | 196 | }; |
197 | 197 | ||
198 | static struct flexcan_devtype_data fsl_p1010_devtype_data = { | 198 | static struct flexcan_devtype_data fsl_p1010_devtype_data = { |
@@ -960,7 +960,7 @@ static const struct platform_device_id flexcan_id_table[] = { | |||
960 | static int __devinit flexcan_probe(struct platform_device *pdev) | 960 | static int __devinit flexcan_probe(struct platform_device *pdev) |
961 | { | 961 | { |
962 | const struct of_device_id *of_id; | 962 | const struct of_device_id *of_id; |
963 | struct flexcan_devtype_data *devtype_data; | 963 | const struct flexcan_devtype_data *devtype_data; |
964 | struct net_device *dev; | 964 | struct net_device *dev; |
965 | struct flexcan_priv *priv; | 965 | struct flexcan_priv *priv; |
966 | struct resource *mem; | 966 | struct resource *mem; |