From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 28 Oct 2005 16:30:16 +0000 (-0400)
Subject: Merge branch 'master'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'master'
---

15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83
diff --cc include/linux/ata.h
index 065e91e96c27,d2873b732bb1..d54da3306d2c
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@@ -257,9 -261,7 +262,9 @@@ struct ata_taskfile 
  	  ((u64) (id)[(n) + 1] << 16) |	\
  	  ((u64) (id)[(n) + 0]) )
  
 +#define ata_id_cdb_intr(id)	(((id)[0] & 0x60) == 0x20)
 +
- static inline int ata_id_current_chs_valid(u16 *id)
+ static inline int ata_id_current_chs_valid(const u16 *id)
  {
  	/* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command 
  	   has not been issued to the device then the values of