diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:45:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:45:13 -0400 |
| commit | 79fa1b677be3a985cc66b9218a4dd09818f1051b (patch) | |
| tree | d36030be7cd07461055f005394ef275212353010 /include/linux | |
| parent | 31ce6daefe2d312e31ee06b0b3301b1cb7878c04 (diff) | |
| parent | c2a6585296009379e0f4eff39cdcb108b457ebf2 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index cc6cc08e8010..44d074ff7789 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | #undef ATA_NDEBUG /* define to disable quick runtime checks */ | 44 | #undef ATA_NDEBUG /* define to disable quick runtime checks */ |
| 45 | #undef ATA_ENABLE_PATA /* define to enable PATA support in some | 45 | #undef ATA_ENABLE_PATA /* define to enable PATA support in some |
| 46 | * low-level drivers */ | 46 | * low-level drivers */ |
| 47 | #undef ATAPI_ENABLE_DMADIR /* enables ATAPI DMADIR bridge support */ | ||
| 48 | 47 | ||
| 49 | 48 | ||
| 50 | /* note: prints function name for you */ | 49 | /* note: prints function name for you */ |