Merge commit 'v2.6.32-rc3'

1 files changed, 0 insertions, 4 deletions

diff --git a/fs/udf/lowlevel.c b/fs/udf/lowlevel.c
index 1b88fd5df05d..43e24a3b8e10 100644
--- a/fs/udf/lowlevel.c
+++ b/fs/udf/lowlevel.c
@@ -36,14 +36,10 @@ unsigned int udf_get_last_session(struct super_block *sb)
         ms_info.addr_format = CDROM_LBA;
         i = ioctl_by_bdev(bdev, CDROMMULTISESSION, (unsigned long)&ms_info);
 
-#define WE_OBEY_THE_WRITTEN_STANDARDS 1
-
         if (i == 0) {
                 udf_debug("XA disk: %s, vol_desc_start=%d\n",
                           (ms_info.xa_flag ? "yes" : "no"), ms_info.addr.lba);
-#if WE_OBEY_THE_WRITTEN_STANDARDS
                 if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */
-#endif
                         vol_desc_start = ms_info.addr.lba;
         } else {
                 udf_debug("CDROMMULTISESSION not supported: rc=%d\n", i);