diff options
| author | Jiri Kosina | 2011-09-15 15:08:05 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2011-09-15 15:08:18 +0200 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /drivers/atm/idt77252.c | |
| parent | viacam: Don't explode if pci_find_bus() returns NULL (diff) | |
| parent | mm: account skipped entries to avoid looping in find_get_pages (diff) | |
| download | kernel-qcow2-linux-e060c38434b2caa78efe7cedaff4191040b65a15.tar.gz kernel-qcow2-linux-e060c38434b2caa78efe7cedaff4191040b65a15.tar.xz kernel-qcow2-linux-e060c38434b2caa78efe7cedaff4191040b65a15.zip | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'drivers/atm/idt77252.c')
| -rw-r--r-- | drivers/atm/idt77252.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 47648535afa7..1c052127548c 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c @@ -46,7 +46,7 @@ #include <asm/io.h> #include <asm/uaccess.h> -#include <asm/atomic.h> +#include <linux/atomic.h> #include <asm/byteorder.h> #ifdef CONFIG_ATM_IDT77252_USE_SUNI |