diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
| commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
| tree | fbdb44317130c371928154c9e6903e699fe2b995 /drivers/atm | |
| parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/eni.c | 1 | ||||
| -rw-r--r-- | drivers/atm/firestream.c | 1 | ||||
| -rw-r--r-- | drivers/atm/horizon.c | 1 | ||||
| -rw-r--r-- | drivers/atm/idt77105.c | 1 | ||||
| -rw-r--r-- | drivers/atm/iphase.c | 1 | ||||
| -rw-r--r-- | drivers/atm/suni.c | 1 | ||||
| -rw-r--r-- | drivers/atm/zatm.c | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index 6ff612d099c3..2059ee460b0c 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/atm_eni.h> | 19 | #include <linux/atm_eni.h> |
| 20 | #include <linux/bitops.h> | 20 | #include <linux/bitops.h> |
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | #include <asm/system.h> | ||
| 23 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 24 | #include <linux/atomic.h> | 23 | #include <linux/atomic.h> |
| 25 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index 5072f8ac16fd..86fed1b91695 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | #include <linux/bitops.h> | 49 | #include <linux/bitops.h> |
| 50 | #include <linux/slab.h> | 50 | #include <linux/slab.h> |
| 51 | #include <asm/byteorder.h> | 51 | #include <asm/byteorder.h> |
| 52 | #include <asm/system.h> | ||
| 53 | #include <asm/string.h> | 52 | #include <asm/string.h> |
| 54 | #include <asm/io.h> | 53 | #include <asm/io.h> |
| 55 | #include <linux/atomic.h> | 54 | #include <linux/atomic.h> |
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index 71c801bb6845..7d01c2a75256 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | #include <linux/wait.h> | 43 | #include <linux/wait.h> |
| 44 | #include <linux/slab.h> | 44 | #include <linux/slab.h> |
| 45 | 45 | ||
| 46 | #include <asm/system.h> | ||
| 47 | #include <asm/io.h> | 46 | #include <asm/io.h> |
| 48 | #include <linux/atomic.h> | 47 | #include <linux/atomic.h> |
| 49 | #include <asm/uaccess.h> | 48 | #include <asm/uaccess.h> |
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c index 487a54739854..45d506363aba 100644 --- a/drivers/atm/idt77105.c +++ b/drivers/atm/idt77105.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/atm_idt77105.h> | 16 | #include <linux/atm_idt77105.h> |
| 17 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
| 18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
| 19 | #include <asm/system.h> | ||
| 20 | #include <asm/param.h> | 19 | #include <asm/param.h> |
| 21 | #include <asm/uaccess.h> | 20 | #include <asm/uaccess.h> |
| 22 | 21 | ||
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 9e373ba20308..d4386019af5d 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
| @@ -56,7 +56,6 @@ | |||
| 56 | #include <linux/interrupt.h> | 56 | #include <linux/interrupt.h> |
| 57 | #include <linux/wait.h> | 57 | #include <linux/wait.h> |
| 58 | #include <linux/slab.h> | 58 | #include <linux/slab.h> |
| 59 | #include <asm/system.h> | ||
| 60 | #include <asm/io.h> | 59 | #include <asm/io.h> |
| 61 | #include <linux/atomic.h> | 60 | #include <linux/atomic.h> |
| 62 | #include <asm/uaccess.h> | 61 | #include <asm/uaccess.h> |
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c index 90f1ccca9e52..02159345566c 100644 --- a/drivers/atm/suni.c +++ b/drivers/atm/suni.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/capability.h> | 22 | #include <linux/capability.h> |
| 23 | #include <linux/atm_suni.h> | 23 | #include <linux/atm_suni.h> |
| 24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 25 | #include <asm/system.h> | ||
| 26 | #include <asm/param.h> | 25 | #include <asm/param.h> |
| 27 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
| 28 | #include <linux/atomic.h> | 27 | #include <linux/atomic.h> |
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c index d889f56e8d8c..abe4e20b0766 100644 --- a/drivers/atm/zatm.c +++ b/drivers/atm/zatm.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/wait.h> | 24 | #include <linux/wait.h> |
| 25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 26 | #include <asm/byteorder.h> | 26 | #include <asm/byteorder.h> |
| 27 | #include <asm/system.h> | ||
| 28 | #include <asm/string.h> | 27 | #include <asm/string.h> |
| 29 | #include <asm/io.h> | 28 | #include <asm/io.h> |
| 30 | #include <linux/atomic.h> | 29 | #include <linux/atomic.h> |