Merge branch 'master' into for-linus

This commit is contained in:
Chris Metcalf
2010-08-13 19:59:15 -04:00
1214 changed files with 45869 additions and 13762 deletions
-3
View File
@@ -72,9 +72,6 @@ dma_set_mask(struct device *dev, u64 mask);
extern int
dma_get_cache_alignment(void);
extern int
dma_is_consistent(struct device *dev, dma_addr_t dma_handle);
extern void
dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction);
+4
View File
@@ -11,6 +11,10 @@
* -Eric Paris
*/
/*
* When introducing new O_* bits, please check its uniqueness in fcntl_init().
*/
#define O_ACCMODE 00000003
#define O_RDONLY 00000000
#define O_WRONLY 00000001