diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/ide/ide.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/ide/ide.c')
| -rw-r--r-- | drivers/ide/ide.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 16d056939f9f..3cb9c4e056ff 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | #include <linux/major.h> | 52 | #include <linux/major.h> |
| 53 | #include <linux/errno.h> | 53 | #include <linux/errno.h> |
| 54 | #include <linux/genhd.h> | 54 | #include <linux/genhd.h> |
| 55 | #include <linux/slab.h> | ||
| 56 | #include <linux/init.h> | 55 | #include <linux/init.h> |
| 57 | #include <linux/pci.h> | 56 | #include <linux/pci.h> |
| 58 | #include <linux/ide.h> | 57 | #include <linux/ide.h> |