package/ep80579-drivers: refresh patches
SVN-Revision: 31801
This commit is contained in:
parent
1751186f18
commit
7217afc657
7 changed files with 35 additions and 39 deletions
|
@ -1,7 +1,6 @@
|
||||||
diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
--- a/Embedded/src/CAN/can_main.c
|
||||||
--- a/Embedded/src/CAN/can_main.c 2009-11-30 10:44:39.044269751 +0100
|
+++ b/Embedded/src/CAN/can_main.c
|
||||||
+++ b/Embedded/src/CAN/can_main.c 2009-11-30 10:54:41.434355642 +0100
|
@@ -214,8 +214,8 @@ int can_pci_probe(struct pci_dev *dev, c
|
||||||
@@ -213,8 +213,8 @@
|
|
||||||
spin_lock_init(&(g_can_os[can_num].int_spinlock));
|
spin_lock_init(&(g_can_os[can_num].int_spinlock));
|
||||||
spin_lock_init(&(g_can_os[can_num].open_spinlock));
|
spin_lock_init(&(g_can_os[can_num].open_spinlock));
|
||||||
|
|
||||||
|
@ -12,7 +11,7 @@ diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
||||||
{
|
{
|
||||||
printk("Couldn't create CAN device %d. Exiting.\n",
|
printk("Couldn't create CAN device %d. Exiting.\n",
|
||||||
dev->device);
|
dev->device);
|
||||||
@@ -236,7 +236,7 @@
|
@@ -237,7 +237,7 @@ int can_pci_probe(struct pci_dev *dev, c
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
void can_pci_remove(struct pci_dev *dev)
|
void can_pci_remove(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
|
@ -21,7 +20,7 @@ diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
||||||
|
|
||||||
iounmap(can_os->pci_remap);
|
iounmap(can_os->pci_remap);
|
||||||
icp_can_destroy(can_os->can);
|
icp_can_destroy(can_os->can);
|
||||||
@@ -250,7 +250,7 @@
|
@@ -251,7 +251,7 @@ int can_pci_suspend(struct pci_dev *dev,
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
unsigned int int_status;
|
unsigned int int_status;
|
||||||
|
@ -30,7 +29,7 @@ diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
/* Indicate that we are suspending */
|
/* Indicate that we are suspending */
|
||||||
@@ -321,7 +321,7 @@
|
@@ -322,7 +322,7 @@ int can_pci_suspend(struct pci_dev *dev,
|
||||||
int can_pci_resume(struct pci_dev *dev)
|
int can_pci_resume(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
diff -Nur a/Embedded/src/1588/1588.c b/Embedded/src/1588/1588.c
|
--- a/Embedded/src/1588/1588.c
|
||||||
--- a/Embedded/src/1588/1588.c 2009-11-10 14:20:46.563322192 +0100
|
+++ b/Embedded/src/1588/1588.c
|
||||||
+++ b/Embedded/src/1588/1588.c 2009-11-30 10:44:22.144270452 +0100
|
|
||||||
@@ -72,6 +72,7 @@
|
@@ -72,6 +72,7 @@
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
@ -9,9 +8,8 @@ diff -Nur a/Embedded/src/1588/1588.c b/Embedded/src/1588/1588.c
|
||||||
#include "1588.h"
|
#include "1588.h"
|
||||||
|
|
||||||
MODULE_AUTHOR("Intel(R) Corporation");
|
MODULE_AUTHOR("Intel(R) Corporation");
|
||||||
diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
--- a/Embedded/src/CAN/can_main.c
|
||||||
--- a/Embedded/src/CAN/can_main.c 2009-11-10 14:20:46.563322192 +0100
|
+++ b/Embedded/src/CAN/can_main.c
|
||||||
+++ b/Embedded/src/CAN/can_main.c 2009-11-30 10:44:39.044269751 +0100
|
|
||||||
@@ -68,6 +68,7 @@
|
@@ -68,6 +68,7 @@
|
||||||
*
|
*
|
||||||
**************************************************************************/
|
**************************************************************************/
|
||||||
|
@ -19,10 +17,9 @@ diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
||||||
+#include <linux/sched.h>
|
+#include <linux/sched.h>
|
||||||
#include "can_main.h"
|
#include "can_main.h"
|
||||||
#include "can_ioctl.h"
|
#include "can_ioctl.h"
|
||||||
|
#include <linux/fs.h>
|
||||||
diff -Nur a/Embedded/src/WDT/iwdt.c b/Embedded/src/WDT/iwdt.c
|
--- a/Embedded/src/WDT/iwdt.c
|
||||||
--- a/Embedded/src/WDT/iwdt.c 2009-11-10 14:20:46.563322192 +0100
|
+++ b/Embedded/src/WDT/iwdt.c
|
||||||
+++ b/Embedded/src/WDT/iwdt.c 2009-11-30 10:44:54.024262744 +0100
|
|
||||||
@@ -137,6 +137,7 @@
|
@@ -137,6 +137,7 @@
|
||||||
#include <linux/watchdog.h>
|
#include <linux/watchdog.h>
|
||||||
#include <linux/miscdevice.h>
|
#include <linux/miscdevice.h>
|
||||||
|
|
Loading…
Reference in a new issue